comparison src/share/vm/c1x/c1x_Compiler.cpp @ 1428:695451afc619

refactoring classes into separate files
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 19 Aug 2010 14:34:52 -0700
parents 98fffb304868
children abc670a709dc
comparison
equal deleted inserted replaced
1427:149b1d2316de 1428:695451afc619
38 assert(klass != NULL, "c1x VMEntries class not found"); 38 assert(klass != NULL, "c1x VMEntries class not found");
39 env->RegisterNatives(klass, VMEntries_methods, VMEntries_methods_count() ); 39 env->RegisterNatives(klass, VMEntries_methods, VMEntries_methods_count() );
40 40
41 check_pending_exception("Could not register natives"); 41 check_pending_exception("Could not register natives");
42 42
43 compute_offsets(); 43 c1x_compute_offsets();
44 } 44 }
45 45
46 // Compilation entry point for methods 46 // Compilation entry point for methods
47 void C1XCompiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci) { 47 void C1XCompiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci) {
48 initialize(); 48 initialize();
49 49
50 VM_ENTRY_MARK; 50 VM_ENTRY_MARK;
51
52 ResourceMark rm; 51 ResourceMark rm;
53 HandleMark hm; 52 HandleMark hm;
54 53
55 C1XObjects::initializeObjects(); 54 VmIds::initializeObjects();
56 55
57 CompilerThread::current()->set_compiling(true); 56 CompilerThread::current()->set_compiling(true);
58 methodOop method = (methodOop)target->get_oop(); 57 methodOop method = (methodOop)target->get_oop();
59 VMExits::compileMethod(C1XObjects::add<methodOop>(method), C1XObjects::toString<Handle>(method->name(), THREAD), entry_bci); 58 VMExits::compileMethod(VmIds::add<methodOop>(method), VmIds::toString<Handle>(method->name(), THREAD), entry_bci);
60 CompilerThread::current()->set_compiling(false); 59 CompilerThread::current()->set_compiling(false);
61 60
62 C1XObjects::cleanupLocalObjects(); 61 VmIds::cleanupLocalObjects();
63 } 62 }
64 63
65 // Print compilation timers and statistics 64 // Print compilation timers and statistics
66 void C1XCompiler::print_timers() { 65 void C1XCompiler::print_timers() {
67 TRACE_C1X_1("print_timers"); 66 TRACE_C1X_1("print_timers");
71 if (type->is_loaded()) { 70 if (type->is_loaded()) {
72 if (type->is_primitive_type()) { 71 if (type->is_primitive_type()) {
73 return VMExits::createRiTypePrimitive((int)type->basic_type(), THREAD); 72 return VMExits::createRiTypePrimitive((int)type->basic_type(), THREAD);
74 } 73 }
75 klassOop klass = (klassOop)type->get_oop(); 74 klassOop klass = (klassOop)type->get_oop();
76 return VMExits::createRiType(C1XObjects::add<klassOop>(klass), C1XObjects::toString<Handle>(klass->klass_part()->name(), THREAD), THREAD); 75 return VMExits::createRiType(VmIds::add<klassOop>(klass), VmIds::toString<Handle>(klass->klass_part()->name(), THREAD), THREAD);
77 } else { 76 } else {
78 symbolOop name = ((ciKlass *)type)->name()->get_symbolOop(); 77 symbolOop name = ((ciKlass *)type)->name()->get_symbolOop();
79 return VMExits::createRiTypeUnresolved(C1XObjects::toString<Handle>(name, THREAD), C1XObjects::add<klassOop>(accessor), THREAD); 78 return VMExits::createRiTypeUnresolved(VmIds::toString<Handle>(name, THREAD), VmIds::add<klassOop>(accessor), THREAD);
80 } 79 }
81 } 80 }
82 81
83 oop C1XCompiler::get_RiField(ciField *field, TRAPS) { 82 oop C1XCompiler::get_RiField(ciField *field, TRAPS) {
84 oop field_holder = get_RiType(field->holder(), NULL, CHECK_0); 83 oop field_holder = get_RiType(field->holder(), NULL, CHECK_0);
85 oop field_type = get_RiType(field->type(), NULL, CHECK_0); 84 oop field_type = get_RiType(field->type(), NULL, CHECK_0);
86 Handle field_name = C1XObjects::toString<Handle>(field->name()->get_symbolOop(), CHECK_0); 85 Handle field_name = VmIds::toString<Handle>(field->name()->get_symbolOop(), CHECK_0);
87 int offset = field->offset(); 86 int offset = field->offset();
88 87
89 // TODO: implement caching 88 // TODO: implement caching
90 return VMExits::createRiField(field_holder, field_name, field_type, offset, THREAD); 89 return VMExits::createRiField(field_holder, field_name, field_type, offset, THREAD);
91 } 90 }
92 91
93 // C1XObjects implementation
94
95 GrowableArray<address>* C1XObjects::_stubs = NULL;
96 GrowableArray<jobject>* C1XObjects::_localHandles = NULL;
97
98 void C1XObjects::initializeObjects() {
99 if (_stubs == NULL) {
100 assert(_localHandles == NULL, "inconsistent state");
101 _stubs = new(ResourceObj::C_HEAP) GrowableArray<address>(64, true);
102 _localHandles = new(ResourceObj::C_HEAP) GrowableArray<jobject>(64, true);
103 }
104 assert(_localHandles->length() == 0, "invalid state");
105 }
106
107 void C1XObjects::cleanupLocalObjects() {
108 for (int i=0; i<_localHandles->length(); i++) {
109 JNIHandles::destroy_global(_localHandles->at(i));
110 }
111 _localHandles->clear();
112 }
113
114 jlong C1XObjects::addStub(address stub) {
115 assert(!_stubs->contains(stub), "duplicate stub");
116 return _stubs->append(stub) | STUB;
117 }
118
119 jlong C1XObjects::add(Handle obj, CompilerObjectType type) {
120 assert(!obj.is_null(), "cannot add NULL handle");
121 int idx = -1;
122 for (int i=0; i<_localHandles->length(); i++)
123 if (JNIHandles::resolve_non_null(_localHandles->at(i)) == obj()) {
124 idx = i;
125 break;
126 }
127 if (idx = -1) {
128 if (JavaThread::current()->thread_state() == _thread_in_vm) {
129 idx = _localHandles->append(JNIHandles::make_global(obj));
130 } else {
131 VM_ENTRY_MARK;
132 idx = _localHandles->append(JNIHandles::make_global(obj));
133 }
134 }
135 return idx | type;
136 }
137
138 address C1XObjects::getStub(jlong id) {
139 assert((id & TYPE_MASK) == STUB, "wrong id type, STUB expected");
140 assert((id & ~TYPE_MASK) >= 0 && (id & ~TYPE_MASK) < _stubs->length(), "STUB index out of bounds");
141 return _stubs->at(id & ~TYPE_MASK);
142 }
143
144 oop C1XObjects::getObject(jlong id) {
145 assert((id & TYPE_MASK) != STUB, "wrong id type");
146 assert((id & ~TYPE_MASK) >= 0 && (id & ~TYPE_MASK) < _localHandles->length(), "index out of bounds");
147 return JNIHandles::resolve_non_null(_localHandles->at(id & ~TYPE_MASK));
148 }
149
150
151 static void compute_offset(int &dest_offset, klassOop klass_oop, const char* name, const char* signature, bool static_field) {
152 symbolOop name_symbol = SymbolTable::probe(name, strlen(name));
153 symbolOop signature_symbol = SymbolTable::probe(signature, strlen(signature));
154 assert(name_symbol != NULL, "symbol not found - class layout changed?");
155 assert(signature_symbol != NULL, "symbol not found - class layout changed?");
156
157 instanceKlass* ik = instanceKlass::cast(klass_oop);
158 fieldDescriptor fd;
159 if (!ik->find_field(name_symbol, signature_symbol, &fd)) {
160 ResourceMark rm;
161 tty->print_cr("Invalid layout of %s at %s", ik->external_name(), name_symbol->as_C_string());
162 fatal("Invalid layout of preloaded class");
163 }
164 assert(fd.is_static() == static_field, "static/instance mismatch");
165 dest_offset = fd.offset();
166 }
167
168 // create the compute_class
169 #define START_CLASS(name) { klassOop k = SystemDictionary::name##_klass();
170
171 #define END_CLASS }
172
173 #define FIELD(klass, name, signature, static_field) compute_offset(klass::_##name##_offset, k, #name, signature, static_field);
174 #define CHAR_FIELD(klass, name) FIELD(klass, name, "C", false)
175 #define INT_FIELD(klass, name) FIELD(klass, name, "I", false)
176 #define LONG_FIELD(klass, name) FIELD(klass, name, "J", false)
177 #define OOP_FIELD(klass, name, signature) FIELD(klass, name, signature, false)
178 #define STATIC_OOP_FIELD(klass, name, signature) FIELD(klass, name, signature, true)
179
180
181 void C1XCompiler::compute_offsets() {
182 COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, LONG_FIELD, OOP_FIELD, STATIC_OOP_FIELD)
183 }
184
185 #define EMPTY0
186 #define EMPTY1(x)
187 #define EMPTY2(x,y)
188 #define FIELD2(klass, name) int klass::_##name##_offset = 0;
189 #define FIELD3(klass, name, sig) FIELD2(klass, name)
190
191 COMPILER_CLASSES_DO(EMPTY1, EMPTY0, FIELD2, FIELD2, FIELD2, FIELD3, FIELD3)
192
193
194
195
196