Mercurial > hg > truffle
comparison src/cpu/x86/vm/interp_masm_x86_32.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | f34d701e952e |
children | aeaca88565e6 |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
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 #ifdef TARGET_OS_FAMILY_windows | |
46 # include "thread_windows.inline.hpp" | |
47 #endif | |
48 #ifdef TARGET_OS_FAMILY_bsd | |
49 # include "thread_bsd.inline.hpp" | |
50 #endif | |
51 | 40 |
52 | 41 |
53 // Implementation of InterpreterMacroAssembler | 42 // Implementation of InterpreterMacroAssembler |
54 #ifdef CC_INTERP | 43 #ifdef CC_INTERP |
55 void InterpreterMacroAssembler::get_method(Register reg) { | 44 void InterpreterMacroAssembler::get_method(Register reg) { |