diff src/cpu/sparc/vm/sharedRuntime_sparc.cpp @ 17087:4faf9bdb9973

Merge
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Tue, 09 Sep 2014 14:31:36 -0700
parents 2d6dd2eebd51
children 23cdb7e5fa2d
line wrap: on
line diff
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Tue Sep 09 12:22:48 2014 -0700
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Tue Sep 09 14:31:36 2014 -0700
@@ -516,10 +516,11 @@
                               const VMRegPair *regs,
                               Label& skip_fixup);
   void gen_i2c_adapter(int total_args_passed,
-                              // VMReg max_arg,
-                              int comp_args_on_stack, // VMRegStackSlots
-                              const BasicType *sig_bt,
-                              const VMRegPair *regs);
+                       // VMReg max_arg,
+                       int comp_args_on_stack, // VMRegStackSlots
+                       const BasicType *sig_bt,
+                       const VMRegPair *regs,
+                       int frame_extension_argument = -1);
 
   AdapterGenerator(MacroAssembler *_masm) : masm(_masm) {}
 };
@@ -763,12 +764,13 @@
   __ bind(L_fail);
 }
 
-void AdapterGenerator::gen_i2c_adapter(
-                            int total_args_passed,
-                            // VMReg max_arg,
-                            int comp_args_on_stack, // VMRegStackSlots
-                            const BasicType *sig_bt,
-                            const VMRegPair *regs) {
+void AdapterGenerator::gen_i2c_adapter(int total_args_passed,
+                                       // VMReg max_arg,
+                                       int comp_args_on_stack, // VMRegStackSlots
+                                       const BasicType *sig_bt,
+                                       const VMRegPair *regs,
+                                       int frame_extension_argument) {
+  assert(frame_extension_argument == -1, "unsupported");
 
   // Generate an I2C adapter: adjust the I-frame to make space for the C-frame
   // layout.  Lesp was saved by the calling I-frame and will be restored on
@@ -1026,9 +1028,10 @@
                                     int total_args_passed,
                                     int comp_args_on_stack,
                                     const BasicType *sig_bt,
-                                    const VMRegPair *regs) {
+                                    const VMRegPair *regs,
+                                    int frame_extension_arguments) {
   AdapterGenerator agen(masm);
-  agen.gen_i2c_adapter(total_args_passed, comp_args_on_stack, sig_bt, regs);
+  agen.gen_i2c_adapter(total_args_passed, comp_args_on_stack, sig_bt, regs, frame_extension_arguments);
 }
 
 // ---------------------------------------------------------------