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

fix tracking of stack operations in compile.cpp

Browse Source
This commit is contained in:
Joel Dice 2008-03-11 10:57:35 -06:00
parent c5b8b83cc7
commit 7cd79736c2
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/compile.cpp
View File

@ -1436,6 +1436,31 @@ resultSize(MyThread* t, unsigned code)
} }
} }
void
pushReturnValue(MyThread* t, Frame* frame, unsigned code,
Compiler::Operand* result)
{
switch (code) {
case ByteField:
case BooleanField:
case CharField:
case ShortField:
case FloatField:
case IntField:
return frame->pushInt(result);
case ObjectField:
return frame->pushObject(result);
case LongField:
case DoubleField:
return frame->pushLong(result);
default:
abort(t);
}
}
bool bool
emptyMethod(MyThread* t, object method) emptyMethod(MyThread* t, object method)
{ {
@ -1465,10 +1490,10 @@ compileDirectInvoke(MyThread* t, Frame* frame, object target)
0); 0);
} }
c->popped(methodParameterFootprint(t, target)); frame->pop(methodParameterFootprint(t, target));
if (rSize) { if (rSize) {
c->push(rSize, result); pushReturnValue(t, frame, methodReturnCode(t, target), result);
} }
} }
@ -2427,7 +2452,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip)
frame->pop(parameterFootprint); frame->pop(parameterFootprint);
if (rSize) { if (rSize) {
c->push(rSize, result); pushReturnValue(t, frame, methodReturnCode(t, target), result);
} }
} break; } break;
@ -2483,7 +2508,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip)
frame->pop(parameterFootprint); frame->pop(parameterFootprint);
if (rSize) { if (rSize) {
c->push(rSize, result); pushReturnValue(t, frame, methodReturnCode(t, target), result);
} }
} break; } break;