*** old/src/cpu/x86/vm/assembler_x86.cpp	Fri Apr 29 15:28:56 2011
--- new/src/cpu/x86/vm/assembler_x86.cpp	Fri Apr 29 15:28:55 2011

*** 6037,6046 ****
--- 6037,6083 ----
    pass_arg1(this, arg_1);
    pass_arg0(this, arg_0);
    call_VM_leaf(entry_point, 3);
  }
  
+ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0) {
+   pass_arg0(this, arg_0);
+   MacroAssembler::call_VM_leaf_base(entry_point, 1);
+ }
+ 
+ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1) {
+ 
+   LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+   pass_arg1(this, arg_1);
+   pass_arg0(this, arg_0);
+   MacroAssembler::call_VM_leaf_base(entry_point, 2);
+ }
+ 
+ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2) {
+   LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+   LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+   pass_arg2(this, arg_2);
+   LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+   pass_arg1(this, arg_1);
+   pass_arg0(this, arg_0);
+   MacroAssembler::call_VM_leaf_base(entry_point, 3);
+ }
+ 
+ void MacroAssembler::super_call_VM_leaf(address entry_point, Register arg_0, Register arg_1, Register arg_2, Register arg_3) {
+   LP64_ONLY(assert(arg_0 != c_rarg3, "smashed arg"));
+   LP64_ONLY(assert(arg_1 != c_rarg3, "smashed arg"));
+   LP64_ONLY(assert(arg_2 != c_rarg3, "smashed arg"));
+   pass_arg3(this, arg_3);
+   LP64_ONLY(assert(arg_0 != c_rarg2, "smashed arg"));
+   LP64_ONLY(assert(arg_1 != c_rarg2, "smashed arg"));
+   pass_arg2(this, arg_2);
+   LP64_ONLY(assert(arg_0 != c_rarg1, "smashed arg"));
+   pass_arg1(this, arg_1);
+   pass_arg0(this, arg_0);
+   MacroAssembler::call_VM_leaf_base(entry_point, 4);
+ }
+ 
  void MacroAssembler::check_and_handle_earlyret(Register java_thread) {
  }
  
  void MacroAssembler::check_and_handle_popframe(Register java_thread) {
  }