diff src/cpu/sparc/vm/interp_masm_sparc.cpp @ 7184:5505fbbae3d3

Merge
author cjplummer
date Thu, 29 Nov 2012 13:55:49 -0800
parents f34d701e952e b2dbd323c668
children aeaca88565e6
line wrap: on
line diff
--- a/src/cpu/sparc/vm/interp_masm_sparc.cpp	Thu Nov 29 11:23:15 2012 -0800
+++ b/src/cpu/sparc/vm/interp_masm_sparc.cpp	Thu Nov 29 13:55:49 2012 -0800
@@ -518,7 +518,8 @@
   delayed()->nop();
 
   // Compute max expression stack+register save area
-  lduh(Lmethod, in_bytes(Method::max_stack_offset()), Gframe_size);  // Load max stack.
+  ld_ptr(Lmethod, in_bytes(Method::const_offset()), Gframe_size);
+  lduh(Gframe_size, in_bytes(ConstMethod::max_stack_offset()), Gframe_size);  // Load max stack.
   add( Gframe_size, frame::memory_parameter_word_sp_offset, Gframe_size );
 
   //