1.1 --- a/src/cpu/x86/vm/interp_masm_x86_64.hpp Mon Oct 21 17:34:27 2013 -0700 1.2 +++ b/src/cpu/x86/vm/interp_masm_x86_64.hpp Tue Oct 22 09:51:47 2013 +0200 1.3 @@ -22,18 +22,6 @@ 1.4 * 1.5 */ 1.6 1.7 -#ifndef CPU_X86_VM_INTERP_MASM_X86_64_HPP 1.8 -#define CPU_X86_VM_INTERP_MASM_X86_64_HPP 1.9 - 1.10 -#include "asm/macroAssembler.hpp" 1.11 -#include "asm/macroAssembler.inline.hpp" 1.12 -#include "interpreter/invocationCounter.hpp" 1.13 -#include "runtime/frame.hpp" 1.14 - 1.15 -// This file specializes the assember with interpreter-specific macros 1.16 - 1.17 - 1.18 -class InterpreterMacroAssembler: public MacroAssembler { 1.19 #ifndef CC_INTERP 1.20 protected: 1.21 // Interpreter specific version of call_VM_base 1.22 @@ -55,7 +43,7 @@ 1.23 #endif // CC_INTERP 1.24 1.25 public: 1.26 - InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code) {} 1.27 + InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code), _locals_register(r14), _bcp_register(r13) {} 1.28 1.29 void load_earlyret_value(TosState state); 1.30 1.31 @@ -224,9 +212,6 @@ 1.32 1.33 void profile_taken_branch(Register mdp, Register bumped_count); 1.34 void profile_not_taken_branch(Register mdp); 1.35 - void profile_obj_type(Register obj, const Address& mdo_addr); 1.36 - void profile_arguments_type(Register mdp, Register callee, Register tmp, bool is_virtual); 1.37 - void profile_return_type(Register mdp, Register ret, Register tmp); 1.38 void profile_call(Register mdp); 1.39 void profile_final_call(Register mdp); 1.40 void profile_virtual_call(Register receiver, Register mdp, 1.41 @@ -253,6 +238,3 @@ 1.42 // support for jvmti/dtrace 1.43 void notify_method_entry(); 1.44 void notify_method_exit(TosState state, NotifyMethodExitMode mode); 1.45 -}; 1.46 - 1.47 -#endif // CPU_X86_VM_INTERP_MASM_X86_64_HPP