comparison src/share/vm/graal/graalCodeInstaller.hpp @ 20807:8d4496e10a51

Fix merge
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Wed, 08 Apr 2015 11:07:01 +0200
parents c1f116cd4b67
children 0d578aeb2b5e
comparison
equal deleted inserted replaced
20806:6ee9b878902b 20807:8d4496e10a51
105 objArrayOop comments() { return (objArrayOop) JNIHandles::resolve(_comments_handle); } 105 objArrayOop comments() { return (objArrayOop) JNIHandles::resolve(_comments_handle); }
106 #endif 106 #endif
107 107
108 public: 108 public:
109 109
110 CodeInstaller() {} 110 CodeInstaller() : _arena(Arena(mtCompiler)) {}
111 GraalEnv::CodeInstallResult install(Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log); 111 GraalEnv::CodeInstallResult install(Handle& compiled_code, CodeBlob*& cb, Handle installed_code, Handle speculation_log);
112 112
113 static address runtime_call_target_address(oop runtime_call); 113 static address runtime_call_target_address(oop runtime_call);
114 static VMReg get_hotspot_reg(jint graalRegisterNumber); 114 static VMReg get_hotspot_reg(jint graalRegisterNumber);
115 static bool is_general_purpose_reg(VMReg hotspotRegister); 115 static bool is_general_purpose_reg(VMReg hotspotRegister);