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 stack pointer adjustment in invokeNative2; pad frame size using Architecture::frameFootprint in MyProcessor::invoke to conform to new calling convention

Browse Source
This commit is contained in:
Joel Dice 2009-04-25 17:33:42 -06:00
parent 5354e36530
commit 141862470b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compile.cpp
View File

@ -4836,16 +4836,17 @@ invokeNative2(MyThread* t, object method)
default: abort(t); default: abort(t);
} }
if (t->arch->argumentFootprint(footprint) unsigned parameterFootprint = methodParameterFootprint(t, method);
if (t->arch->argumentFootprint(parameterFootprint)
> t->arch->stackAlignmentInWords()) > t->arch->stackAlignmentInWords())
{ {
t->stack = static_cast<uintptr_t*>(t->stack) t->stack = static_cast<uintptr_t*>(t->stack)
+ (t->arch->argumentFootprint(footprint) + (t->arch->argumentFootprint(parameterFootprint)
- t->arch->stackAlignmentInWords()); - t->arch->stackAlignmentInWords());
} }
t->stack = static_cast<uintptr_t*>(t->stack) t->stack = static_cast<uintptr_t*>(t->stack)
- t->arch->frameReturnAddressSize(); + t->arch->frameReturnAddressSize();
} else { } else {
result = 0; result = 0;
} }
@ -5139,7 +5140,8 @@ invoke(Thread* thread, object method, ArgumentList* arguments)
(t, reinterpret_cast<void*>(methodAddress(t, method)), (t, reinterpret_cast<void*>(methodAddress(t, method)),
arguments->array + arguments->position, arguments->array + arguments->position,
count * BytesPerWord, count * BytesPerWord,
t->arch->alignFrameSize(count) * BytesPerWord, t->arch->alignFrameSize(count + t->arch->frameFootprint(0))
* BytesPerWord,
returnType); returnType);
} }