Mercurial > hg > graal-jvmci-8
comparison src/os/windows/vm/os_windows.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | f34d701e952e cd3d6a6b95d9 |
children | 291ffc492eb6 730cc4ddd550 7d42f3b08300 |
comparison
equal
deleted
inserted
replaced
7191:816b7e5bf2ed | 7206:d2f8c38e543d |
---|---|
30 #include "classfile/systemDictionary.hpp" | 30 #include "classfile/systemDictionary.hpp" |
31 #include "classfile/vmSymbols.hpp" | 31 #include "classfile/vmSymbols.hpp" |
32 #include "code/icBuffer.hpp" | 32 #include "code/icBuffer.hpp" |
33 #include "code/vtableStubs.hpp" | 33 #include "code/vtableStubs.hpp" |
34 #include "compiler/compileBroker.hpp" | 34 #include "compiler/compileBroker.hpp" |
35 #include "compiler/disassembler.hpp" | |
35 #include "interpreter/interpreter.hpp" | 36 #include "interpreter/interpreter.hpp" |
36 #include "jvm_windows.h" | 37 #include "jvm_windows.h" |
37 #include "memory/allocation.inline.hpp" | 38 #include "memory/allocation.inline.hpp" |
38 #include "memory/filemap.hpp" | 39 #include "memory/filemap.hpp" |
39 #include "mutex_windows.inline.hpp" | 40 #include "mutex_windows.inline.hpp" |
63 #include "utilities/decoder.hpp" | 64 #include "utilities/decoder.hpp" |
64 #include "utilities/defaultStream.hpp" | 65 #include "utilities/defaultStream.hpp" |
65 #include "utilities/events.hpp" | 66 #include "utilities/events.hpp" |
66 #include "utilities/growableArray.hpp" | 67 #include "utilities/growableArray.hpp" |
67 #include "utilities/vmError.hpp" | 68 #include "utilities/vmError.hpp" |
68 #ifdef TARGET_ARCH_x86 | |
69 # include "assembler_x86.inline.hpp" | |
70 # include "nativeInst_x86.hpp" | |
71 #endif | |
72 | 69 |
73 #ifdef _DEBUG | 70 #ifdef _DEBUG |
74 #include <crtdbg.h> | 71 #include <crtdbg.h> |
75 #endif | 72 #endif |
76 | 73 |