Mercurial > hg > truffle

comparison src/share/vm/graal/graalCodeInstaller.cpp @ 18043:f55f2d400797

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some format strings
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 20:34:55 +0200
parents 9a804ec7f707
children c59612b9d110
comparison
equal deleted inserted replaced
18042:3498d73280c8 18043:f55f2d400797
153 153
154 static void record_metadata_reference(oop obj, jlong prim, bool compressed, OopRecorder* oop_recorder) { 154 static void record_metadata_reference(oop obj, jlong prim, bool compressed, OopRecorder* oop_recorder) {
155 if (obj->is_a(HotSpotResolvedObjectType::klass())) { 155 if (obj->is_a(HotSpotResolvedObjectType::klass())) {
156 Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaClass(obj)); 156 Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaClass(obj));
157 if (compressed) { 157 if (compressed) {
158 assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim)); 158 assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
159 } else { 159 } else {
160 assert((Klass*) prim == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim)); 160 assert((Klass*) prim == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
161 } 161 }
162 int index = oop_recorder->find_index(klass); 162 int index = oop_recorder->find_index(klass);
163 TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), klass->name()->as_C_string()); 163 TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), klass->name()->as_C_string());
164 } else if (obj->is_a(HotSpotResolvedJavaMethod::klass())) { 164 } else if (obj->is_a(HotSpotResolvedJavaMethod::klass())) {
165 Method* method = (Method*) (address) HotSpotResolvedJavaMethod::metaspaceMethod(obj); 165 Method* method = (Method*) (address) HotSpotResolvedJavaMethod::metaspaceMethod(obj);
166 assert(!compressed, err_msg("unexpected compressed method pointer %s @ %p = %p", method->name()->as_C_string(), method, prim)); 166 assert(!compressed, err_msg("unexpected compressed method pointer %s @ " INTPTR_FORMAT " = " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method), prim));
167 int index = oop_recorder->find_index(method); 167 int index = oop_recorder->find_index(method);
168 TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), method->name()->as_C_string()); 168 TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), method->name()->as_C_string());
169 } else { 169 } else {
170 assert(java_lang_String::is_instance(obj), 170 assert(java_lang_String::is_instance(obj),
171 err_msg("unexpected metadata reference (%s) for constant %ld (%p)", obj->klass()->name()->as_C_string(), prim, prim)); 171 err_msg("unexpected metadata reference (%s) for constant " JLONG_FORMAT " (" INTPTR_FORMAT ")", obj->klass()->name()->as_C_string(), prim, prim));
172 } 172 }
173 } 173 }
174 174
175 // Records any Metadata values embedded in a Constant (e.g., the value returned by HotSpotResolvedObjectType.klass()). 175 // Records any Metadata values embedded in a Constant (e.g., the value returned by HotSpotResolvedObjectType.klass()).
176 static void record_metadata_in_constant(oop constant, OopRecorder* oop_recorder) { 176 static void record_metadata_in_constant(oop constant, OopRecorder* oop_recorder) {
449 cb = nm; 449 cb = nm;
450 } 450 }
451 451
452 if (cb != NULL) { 452 if (cb != NULL) {
453 // Make sure the pre-calculated constants section size was correct. 453 // Make sure the pre-calculated constants section size was correct.
454 guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", cb->code_begin() - cb->content_begin(), _constants_size)); 454 guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", (int)(cb->code_begin() - cb->content_begin()), _constants_size));
455 } 455 }
456 return result; 456 return result;
457 } 457 }
458 458
459 void CodeInstaller::initialize_fields(oop compiled_code) { 459 void CodeInstaller::initialize_fields(oop compiled_code) {