Bug 886966: OdinMonkey: Fix FFI calls when passing arguments from the stack on ARM, r=mjrosenb

This commit is contained in:
Hannes Verschore 2013-07-09 14:03:24 +02:00
parent 9c4fd821b1
commit d9d83d3b78

View File

@ -5772,7 +5772,12 @@ GenerateFFIIonExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit
// 5. Fill the arguments
unsigned offsetToArgs = 3 * sizeof(size_t) + sizeof(Value);
unsigned offsetToCallerStackArgs = NativeFrameSize + masm.framePushed();
unsigned offsetToCallerStackArgs = masm.framePushed();
#if defined(JS_CPU_X86) || defined(JS_CPU_X64)
offsetToCallerStackArgs += NativeFrameSize;
#else
offsetToCallerStackArgs += ShadowStackSpace;
#endif
FillArgumentArray(m, exit.argTypes(), offsetToArgs, offsetToCallerStackArgs, scratch);
// Get the pointer to the ion code