ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of dice.ecovate.com:/home/dicej/git/vm

Browse Source
This commit is contained in:
Eric Scharff 2007-10-16 12:16:01 -06:00
commit 3779f21424
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compile.cpp
View File

@ -894,10 +894,8 @@ findExceptionHandler(Thread* t, void* frame)
catchType = 0; catchType = 0;
} }
if (Verbose and if (catchType == 0 or instanceOf(t, catchType, t->exception)) {
(catchType == 0 or if (Verbose) {
instanceOf(t, catchType, t->exception)))
{
fprintf(stderr, "exception handler match for %d in %s: " fprintf(stderr, "exception handler match for %d in %s: "
"start: %d; end: %d; ip: %d\n", "start: %d; end: %d; ip: %d\n",
offset, offset,
@ -905,6 +903,7 @@ findExceptionHandler(Thread* t, void* frame)
nativeExceptionHandlerStart(handler), nativeExceptionHandlerStart(handler),
nativeExceptionHandlerEnd(handler), nativeExceptionHandlerEnd(handler),
nativeExceptionHandlerIp(handler)); nativeExceptionHandlerIp(handler));
}
return handler; return handler;
} }
@ -2089,7 +2088,13 @@ class Compiler: public Assembler {
lea(rsp, FrameFootprint + BytesPerWord, rcx); lea(rsp, FrameFootprint + BytesPerWord, rcx);
mov(rcx, rdi, threadFrameOffset()); // set thread frame to current mov(rcx, rdi, threadFrameOffset()); // set thread frame to current
jmp(rbx); push(rbp);
call(rbx);
add(BytesPerWord, rsp);
ret();
return finish(); return finish();
} }