Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/interp_masm_x86_64.hpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | cd3d6a6b95d9 |
children | c76b43ed5089 aeaca88565e6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp Fri Dec 07 01:09:03 2012 -0800 @@ -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