Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/vframe.cpp @ 6988:2cb439954abf
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 19 Nov 2012 15:36:13 +0100 |
parents | e522a00b91aa 070d523b96a7 |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
6963:dd0dd0321e2a | 6988:2cb439954abf |
---|---|
147 st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj()); | 147 st->print("\t- %s <" INTPTR_FORMAT "> ", lock_state, (address)obj()); |
148 if (obj->klass() == SystemDictionary::Class_klass()) { | 148 if (obj->klass() == SystemDictionary::Class_klass()) { |
149 Klass* target_klass = java_lang_Class::as_Klass(obj()); | 149 Klass* target_klass = java_lang_Class::as_Klass(obj()); |
150 st->print_cr("(a java.lang.Class for %s)", InstanceKlass::cast(target_klass)->external_name()); | 150 st->print_cr("(a java.lang.Class for %s)", InstanceKlass::cast(target_klass)->external_name()); |
151 } else { | 151 } else { |
152 Klass* k = Klass::cast(obj->klass()); | 152 Klass* k = obj->klass(); |
153 st->print_cr("(a %s)", k->external_name()); | 153 st->print_cr("(a %s)", k->external_name()); |
154 } | 154 } |
155 } | 155 } |
156 } | 156 } |
157 | 157 |
170 print_locked_object_class_name(st, o, "waiting on"); | 170 print_locked_object_class_name(st, o, "waiting on"); |
171 } | 171 } |
172 } | 172 } |
173 } else if (thread()->current_park_blocker() != NULL) { | 173 } else if (thread()->current_park_blocker() != NULL) { |
174 oop obj = thread()->current_park_blocker(); | 174 oop obj = thread()->current_park_blocker(); |
175 Klass* k = Klass::cast(obj->klass()); | 175 Klass* k = obj->klass(); |
176 st->print_cr("\t- %s <" INTPTR_FORMAT "> (a %s)", "parking to wait for ", (address)obj, k->external_name()); | 176 st->print_cr("\t- %s <" INTPTR_FORMAT "> (a %s)", "parking to wait for ", (address)obj, k->external_name()); |
177 } | 177 } |
178 } | 178 } |
179 | 179 |
180 | 180 |
548 void javaVFrame::print_value() const { | 548 void javaVFrame::print_value() const { |
549 Method* m = method(); | 549 Method* m = method(); |
550 InstanceKlass* k = m->method_holder(); | 550 InstanceKlass* k = m->method_holder(); |
551 tty->print_cr("frame( sp=" INTPTR_FORMAT ", unextended_sp=" INTPTR_FORMAT ", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT ")", | 551 tty->print_cr("frame( sp=" INTPTR_FORMAT ", unextended_sp=" INTPTR_FORMAT ", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT ")", |
552 _fr.sp(), _fr.unextended_sp(), _fr.fp(), _fr.pc()); | 552 _fr.sp(), _fr.unextended_sp(), _fr.fp(), _fr.pc()); |
553 tty->print("%s.%s", Klass::cast(k)->internal_name(), m->name()->as_C_string()); | 553 tty->print("%s.%s", k->internal_name(), m->name()->as_C_string()); |
554 | 554 |
555 if (!m->is_native()) { | 555 if (!m->is_native()) { |
556 Symbol* source_name = k->source_file_name(); | 556 Symbol* source_name = k->source_file_name(); |
557 int line_number = m->line_number_from_bci(bci()); | 557 int line_number = m->line_number_from_bci(bci()); |
558 if (source_name != NULL && (line_number != -1)) { | 558 if (source_name != NULL && (line_number != -1)) { |