Mercurial > hg > graal-jvmci-8
comparison src/share/vm/graal/graalRuntime.cpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | 97e282186b5b |
children | 2dfccd93510a |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
342 } | 342 } |
343 JRT_END | 343 JRT_END |
344 | 344 |
345 JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oop obj, jint flags)) | 345 JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oop obj, jint flags)) |
346 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); | 346 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); |
347 bool address = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); | 347 bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); |
348 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); | 348 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); |
349 if (!string) { | 349 if (!string) { |
350 if (!address && obj->is_oop_or_null(true)) { | 350 if (!addr && obj->is_oop_or_null(true)) { |
351 char buf[O_BUFLEN]; | 351 char buf[O_BUFLEN]; |
352 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), obj); | 352 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj); |
353 } else { | 353 } else { |
354 tty->print("%p", obj); | 354 tty->print("%p", (address)obj); |
355 } | 355 } |
356 } else { | 356 } else { |
357 ResourceMark rm; | 357 ResourceMark rm; |
358 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); | 358 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); |
359 char *buf = java_lang_String::as_utf8_string(obj); | 359 char *buf = java_lang_String::as_utf8_string(obj); |
370 | 370 |
371 JRT_LEAF(void, GraalRuntime::write_barrier_post(JavaThread* thread, void* card_addr)) | 371 JRT_LEAF(void, GraalRuntime::write_barrier_post(JavaThread* thread, void* card_addr)) |
372 thread->dirty_card_queue().enqueue(card_addr); | 372 thread->dirty_card_queue().enqueue(card_addr); |
373 JRT_END | 373 JRT_END |
374 | 374 |
375 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread,oopDesc* parent, oopDesc* child)) | 375 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child)) |
376 bool ret = true; | 376 bool ret = true; |
377 if(!Universe::heap()->is_in_closed_subset(parent)) { | 377 if(!Universe::heap()->is_in_closed_subset(parent)) { |
378 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent); | 378 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent); |
379 parent->print(); | 379 parent->print(); |
380 ret=false; | 380 ret=false; |