ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

various bugfixes

Browse Source
This commit is contained in:
Joel Dice 2009-05-24 18:22:36 -06:00
parent d11af47dca
commit af59c85deb
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compile-x86.S
View File

@ -255,9 +255,9 @@ vmInvoke_returnAddress:
je LOCAL(vmInvoke_exit) je LOCAL(vmInvoke_exit)
movl CONTINUATION_LENGTH(%ecx),%esi movl CONTINUATION_LENGTH(%ecx),%esi
shll $3,%esi shll $2,%esi
subl %esi,%esp subl %esi,%esp
subl $48,%esp subl $16,%esp
leal CONTINUATION_BODY(%ecx),%edi leal CONTINUATION_BODY(%ecx),%edi
@ -269,8 +269,8 @@ vmInvoke_returnAddress:
LOCAL(vmInvoke_continuationLoop): LOCAL(vmInvoke_continuationLoop):
movl (%edi,%edx,1),%eax movl (%edi,%edx,1),%eax
movl %eax,(%esp,%edx,1) movl %eax,8(%esp,%edx,1)
addl $8,%edx addl $4,%edx
LOCAL(vmInvoke_continuationTest): LOCAL(vmInvoke_continuationTest):
cmpl %esi,%edx cmpl %esi,%edx

21
src/compile.cpp
View File

@ -5476,6 +5476,12 @@ callContinuation(MyThread* t, object continuation, object result,
if (method) { if (method) {
rewindMethod(t) = method; rewindMethod(t) = method;
compile(t, ::codeAllocator(t), 0, method);
if (UNLIKELY(t->exception)) {
action = Throw;
}
} else { } else {
object message = makeString object message = makeString
(t, "%s %s not found in %s", (t, "%s %s not found in %s",
@ -5795,6 +5801,15 @@ class MyProcessor: public Processor {
MyThread(m, javaThread, static_cast<MyThread*>(parent)); MyThread(m, javaThread, static_cast<MyThread*>(parent));
t->init(); t->init();
if (false) {
fprintf(stderr, "%d\n", difference(&(t->continuation), t));
fprintf(stderr, "%d\n", difference(&(t->exception), t));
fprintf(stderr, "%d\n", difference(&(t->exceptionStack), t));
fprintf(stderr, "%d\n", difference(&(t->exceptionOffset), t));
fprintf(stderr, "%d\n", difference(&(t->exceptionHandler), t));
exit(0);
}
return t; return t;
} }
@ -6268,11 +6283,13 @@ class MyProcessor: public Processor {
const char* const methodName = "wind"; const char* const methodName = "wind";
const char* const methodSpec const char* const methodSpec
= "(Ljava/lang/Runnable;Ljava/util/concurrent/Callable;" = "(Ljava/lang/Runnable;Ljava/util/concurrent/Callable;"
"Ljava/lang/Runnable;)Ljava/lang/Object;"; "Ljava/lang/Runnable;)Lavian/Continuations$UnwindResult;";
windMethod = resolveMethod(t, className, methodName, methodSpec); windMethod = resolveMethod(t, className, methodName, methodSpec);
if (windMethod == 0) { if (windMethod) {
compile(t, ::codeAllocator(t), 0, windMethod);
} else {
object message = makeString object message = makeString
(t, "%s %s not found in %s", methodName, methodSpec, className); (t, "%s %s not found in %s", methodName, methodSpec, className);
t->exception = makeNoSuchMethodError(t, message); t->exception = makeNoSuchMethodError(t, message);