superficial tweaks

This commit is contained in:
Joel Dice 2007-07-25 18:52:10 -06:00
parent 9ab88ef619
commit b00fcd4463

View File

@ -369,9 +369,8 @@ resolveNativeMethodData(Thread* t, object method)
inline void inline void
checkStack(Thread* t, object method) checkStack(Thread* t, object method)
{ {
unsigned parameterFootprint = methodParameterFootprint(t, method); if (UNLIKELY(t->sp
unsigned base = t->sp - parameterFootprint; + methodParameterFootprint(t, method)
if (UNLIKELY(base
+ codeMaxLocals(t, methodCode(t, method)) + codeMaxLocals(t, methodCode(t, method))
+ FrameFootprint + FrameFootprint
+ codeMaxStack(t, methodCode(t, method)) + codeMaxStack(t, methodCode(t, method))
@ -406,15 +405,15 @@ invokeNative(Thread* t, object method)
args[offset++] = reinterpret_cast<uintptr_t>(t); args[offset++] = reinterpret_cast<uintptr_t>(t);
unsigned start = 0; unsigned i = 0;
if (methodFlags(t, method) & ACC_STATIC) { if (methodFlags(t, method) & ACC_STATIC) {
start = 1; ++ i;
args[offset++] = reinterpret_cast<uintptr_t> args[offset++] = reinterpret_cast<uintptr_t>
(pushReference(t, methodClass(t, method))); (pushReference(t, methodClass(t, method)));
} }
unsigned sp = frameBase(t, t->frame); unsigned sp = frameBase(t, t->frame);
for (unsigned i = start; i < count; ++i) { for (; i < count; ++i) {
unsigned type = nativeMethodDataParameterTypes(t, data, i + 1); unsigned type = nativeMethodDataParameterTypes(t, data, i + 1);
switch (type) { switch (type) {