comparison src/share/vm/graal/graalCodeInstaller.hpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 8e9ffa7c714b
children bf2ea3ed3bce
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
55 }; 55 };
56 56
57 ciEnv* _env; 57 ciEnv* _env;
58 58
59 oop _comp_result; 59 oop _comp_result;
60 oop _hotspot_method;
61 oop _name; 60 oop _name;
62 arrayOop _sites; 61 arrayOop _sites;
63 arrayOop _exception_handlers; 62 arrayOop _exception_handlers;
64 CodeOffsets _offsets; 63 CodeOffsets _offsets;
65 64
84 ImplicitExceptionTable _implicit_exception_table; 83 ImplicitExceptionTable _implicit_exception_table;
85 84
86 public: 85 public:
87 86
88 // constructor used to create a method 87 // constructor used to create a method
89 CodeInstaller(Handle& target_method, nmethod*& nm, bool install_code); 88 CodeInstaller(Handle& comp_result, methodHandle method, nmethod*& nm, bool bind_to_method);
90 89
91 // constructor used to create a stub 90 // constructor used to create a stub
92 CodeInstaller(Handle& target_method, BufferBlob*& blob, jlong& id); 91 CodeInstaller(Handle& target_method, BufferBlob*& blob, jlong& id);
93 92
94 static address runtime_call_target_address(oop runtime_call); 93 static address runtime_call_target_address(oop runtime_call);
95 94
96 private: 95 private:
97 // extract the fields of the InstalledCode 96 // extract the fields of the CompilationResult
98 void initialize_fields(oop target_method); 97 void initialize_fields(oop target_method, methodHandle method);
99 void initialize_assumptions(oop target_method); 98 void initialize_assumptions(oop target_method);
100 99
101 // perform data and call relocation on the CodeBuffer 100 // perform data and call relocation on the CodeBuffer
102 void initialize_buffer(CodeBuffer& buffer); 101 void initialize_buffer(CodeBuffer& buffer);
103 102