Mercurial > hg > truffle
comparison src/cpu/x86/vm/runtime_x86_32.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | cd3d6a6b95d9 |
children |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #ifdef COMPILER2 | 26 #ifdef COMPILER2 |
27 #include "asm/assembler.hpp" | 27 #include "asm/macroAssembler.hpp" |
28 #include "assembler_x86.inline.hpp" | 28 #include "asm/macroAssembler.inline.hpp" |
29 #include "classfile/systemDictionary.hpp" | 29 #include "classfile/systemDictionary.hpp" |
30 #include "code/vmreg.hpp" | 30 #include "code/vmreg.hpp" |
31 #include "interpreter/interpreter.hpp" | 31 #include "interpreter/interpreter.hpp" |
32 #include "nativeInst_x86.hpp" | |
33 #include "opto/runtime.hpp" | 32 #include "opto/runtime.hpp" |
34 #include "runtime/interfaceSupport.hpp" | 33 #include "runtime/interfaceSupport.hpp" |
35 #include "runtime/sharedRuntime.hpp" | 34 #include "runtime/sharedRuntime.hpp" |
36 #include "runtime/stubRoutines.hpp" | 35 #include "runtime/stubRoutines.hpp" |
37 #include "runtime/vframeArray.hpp" | 36 #include "runtime/vframeArray.hpp" |