*** old/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Mon May 19 21:13:10 2008
--- new/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Mon May 19 21:13:10 2008

*** 1918,1928 ****
--- 1918,1927 ----
  
    int i=0;
    int total_strings = 0;
    int first_arg_to_pass = 0;
    int total_c_args = 0;
    int box_offset = java_lang_boxing_object::value_offset_in_bytes();
  
    if( !method->is_static() ) {  // Pass in receiver first
      in_sig_bt[i++] = T_OBJECT;
      first_arg_to_pass = 1;
    }

*** 2129,2139 ****
--- 2128,2141 ----
            __ testl(in_reg, in_reg);
            __ jcc(Assembler::zero, skipUnbox);
            assert(dst.first()->is_stack() &&
                   (!dst.second()->is_valid() || dst.second()->is_stack()),
                   "value(s) must go into stack slots");
            if ( out_sig_bt[c_arg] == T_LONG ) {
+ 
+           BasicType bt = out_sig_bt[c_arg];
+           int box_offset = java_lang_boxing_object::value_offset_in_bytes(bt);
+           if ( bt == T_LONG ) {
              __ movl(rbx, Address(in_reg,
                                   box_offset + VMRegImpl::stack_slot_size));
              __ movl(Address(rsp, reg2offset_out(dst.second())), rbx);
            }
            __ movl(in_reg,  Address(in_reg, box_offset));