Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/os/windows/vm/os_windows.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -32,6 +32,7 @@ #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp" #include "compiler/compileBroker.hpp" +#include "compiler/disassembler.hpp" #include "interpreter/interpreter.hpp" #include "jvm_windows.h" #include "memory/allocation.inline.hpp" @@ -65,10 +66,6 @@ #include "utilities/events.hpp" #include "utilities/growableArray.hpp" #include "utilities/vmError.hpp" -#ifdef TARGET_ARCH_x86 -# include "assembler_x86.inline.hpp" -# include "nativeInst_x86.hpp" -#endif #ifdef _DEBUG #include <crtdbg.h>