Mercurial > hg > truffle
diff src/cpu/x86/vm/sharedRuntime_x86_32.cpp @ 14456:abec000618bf
Merge
| author | kvn |
|---|---|
| date | Tue, 28 Jan 2014 12:25:34 -0800 |
| parents | de6a9e811145 1174c8abbdb6 |
| children | d8041d695d19 62c54fcc0a35 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Jan 28 11:21:43 2014 -0800 +++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Tue Jan 28 12:25:34 2014 -0800 @@ -977,7 +977,9 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt, VMRegPair *regs, + VMRegPair *regs2, int total_args_passed) { + assert(regs2 == NULL, "not needed on x86"); // We return the amount of VMRegImpl stack slots we need to reserve for all // the arguments NOT counting out_preserve_stack_slots. @@ -1624,7 +1626,7 @@ // Now figure out where the args must be stored and how much stack space // they require. int out_arg_slots; - out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args); + out_arg_slots = c_calling_convention(out_sig_bt, out_regs, NULL, total_c_args); // Compute framesize for the wrapper. We need to handlize all oops in // registers a max of 2 on x86. @@ -2495,7 +2497,7 @@ // they require (neglecting out_preserve_stack_slots). int out_arg_slots; - out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args); + out_arg_slots = c_calling_convention(out_sig_bt, out_regs, NULL, total_c_args); // Calculate the total number of stack slots we will need.