Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
23 */ | 23 */ |
24 | 24 |
25 #ifndef CPU_X86_VM_INTERP_MASM_X86_64_HPP | 25 #ifndef CPU_X86_VM_INTERP_MASM_X86_64_HPP |
26 #define CPU_X86_VM_INTERP_MASM_X86_64_HPP | 26 #define CPU_X86_VM_INTERP_MASM_X86_64_HPP |
27 | 27 |
28 #include "assembler_x86.inline.hpp" | 28 #include "asm/macroAssembler.hpp" |
29 #include "asm/macroAssembler.inline.hpp" | |
29 #include "interpreter/invocationCounter.hpp" | 30 #include "interpreter/invocationCounter.hpp" |
31 #include "runtime/frame.hpp" | |
30 | 32 |
31 // This file specializes the assember with interpreter-specific macros | 33 // This file specializes the assember with interpreter-specific macros |
32 | 34 |
33 | 35 |
34 class InterpreterMacroAssembler: public MacroAssembler { | 36 class InterpreterMacroAssembler: public MacroAssembler { |