comparison src/cpu/sparc/vm/interp_masm_sparc.cpp @ 7232:310a68c63b69

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 15:19:38 +0100
parents 5505fbbae3d3
children aeaca88565e6
comparison
equal deleted inserted replaced
7231:c0806f4ff3ea 7232:310a68c63b69
34 #include "prims/jvmtiRedefineClassesTrace.hpp" 34 #include "prims/jvmtiRedefineClassesTrace.hpp"
35 #include "prims/jvmtiThreadState.hpp" 35 #include "prims/jvmtiThreadState.hpp"
36 #include "runtime/basicLock.hpp" 36 #include "runtime/basicLock.hpp"
37 #include "runtime/biasedLocking.hpp" 37 #include "runtime/biasedLocking.hpp"
38 #include "runtime/sharedRuntime.hpp" 38 #include "runtime/sharedRuntime.hpp"
39 #ifdef TARGET_OS_FAMILY_linux 39 #include "runtime/thread.inline.hpp"
40 # include "thread_linux.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_solaris
43 # include "thread_solaris.inline.hpp"
44 #endif
45 40
46 #ifndef CC_INTERP 41 #ifndef CC_INTERP
47 #ifndef FAST_DISPATCH 42 #ifndef FAST_DISPATCH
48 #define FAST_DISPATCH 1 43 #define FAST_DISPATCH 1
49 #endif 44 #endif
521 btst(JVM_ACC_NATIVE, Gframe_size); 516 btst(JVM_ACC_NATIVE, Gframe_size);
522 br(Assembler::notZero, false, Assembler::pt, done); 517 br(Assembler::notZero, false, Assembler::pt, done);
523 delayed()->nop(); 518 delayed()->nop();
524 519
525 // Compute max expression stack+register save area 520 // Compute max expression stack+register save area
526 lduh(Lmethod, in_bytes(Method::max_stack_offset()), Gframe_size); // Load max stack. 521 ld_ptr(Lmethod, in_bytes(Method::const_offset()), Gframe_size);
522 lduh(Gframe_size, in_bytes(ConstMethod::max_stack_offset()), Gframe_size); // Load max stack.
527 add( Gframe_size, frame::memory_parameter_word_sp_offset, Gframe_size ); 523 add( Gframe_size, frame::memory_parameter_word_sp_offset, Gframe_size );
528 524
529 // 525 //
530 // now set up a stack frame with the size computed above 526 // now set up a stack frame with the size computed above
531 // 527 //