Mercurial > hg > truffle
diff src/cpu/x86/vm/interp_masm_x86_64.hpp @ 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 | c76b43ed5089 aeaca88565e6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Dec 14 14:35:13 2012 +0100 @@ -25,8 +25,10 @@ #ifndef CPU_X86_VM_INTERP_MASM_X86_64_HPP #define CPU_X86_VM_INTERP_MASM_X86_64_HPP -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" +#include "asm/macroAssembler.inline.hpp" #include "interpreter/invocationCounter.hpp" +#include "runtime/frame.hpp" // This file specializes the assember with interpreter-specific macros