mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
Merge branch 'master' of dice.ecovate.com:/home/dicej/git/vm
This commit is contained in:
commit
3779f21424
@ -894,17 +894,16 @@ 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: "
|
||||||
{
|
"start: %d; end: %d; ip: %d\n",
|
||||||
fprintf(stderr, "exception handler match for %d in %s: "
|
offset,
|
||||||
"start: %d; end: %d; ip: %d\n",
|
&byteArrayBody(t, methodName(t, frameMethod(frame)), 0),
|
||||||
offset,
|
nativeExceptionHandlerStart(handler),
|
||||||
&byteArrayBody(t, methodName(t, frameMethod(frame)), 0),
|
nativeExceptionHandlerEnd(handler),
|
||||||
nativeExceptionHandlerStart(handler),
|
nativeExceptionHandlerIp(handler));
|
||||||
nativeExceptionHandlerEnd(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();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user