Mercurial > hg > graal-compiler

comparison src/share/vm/graal/graalRuntime.cpp @ 12372:2dfccd93510a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Fri, 11 Oct 2013 21:41:42 +0200
parents 0991c12c4186 359f7e70ae7f
children 370b5f07f9e2 808348377021
comparison
equal deleted inserted replaced
12371:e32f2b195867 12372:2dfccd93510a
348 } 348 }
349 JRT_END 349 JRT_END
350 350
351 JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oop obj, jint flags)) 351 JRT_ENTRY(void, GraalRuntime::log_object(JavaThread* thread, oop obj, jint flags))
352 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING); 352 bool string = mask_bits_are_true(flags, LOG_OBJECT_STRING);
353 bool address = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS); 353 bool addr = mask_bits_are_true(flags, LOG_OBJECT_ADDRESS);
354 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE); 354 bool newline = mask_bits_are_true(flags, LOG_OBJECT_NEWLINE);
355 if (!string) { 355 if (!string) {
356 if (!address && obj->is_oop_or_null(true)) { 356 if (!addr && obj->is_oop_or_null(true)) {
357 char buf[O_BUFLEN]; 357 char buf[O_BUFLEN];
358 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), obj); 358 tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj);
359 } else { 359 } else {
360 tty->print("%p", obj); 360 tty->print("%p", (address)obj);
361 } 361 }
362 } else { 362 } else {
363 ResourceMark rm; 363 ResourceMark rm;
364 assert(obj != NULL && java_lang_String::is_instance(obj), "must be"); 364 assert(obj != NULL && java_lang_String::is_instance(obj), "must be");
365 char *buf = java_lang_String::as_utf8_string(obj); 365 char *buf = java_lang_String::as_utf8_string(obj);
376 376
377 JRT_LEAF(void, GraalRuntime::write_barrier_post(JavaThread* thread, void* card_addr)) 377 JRT_LEAF(void, GraalRuntime::write_barrier_post(JavaThread* thread, void* card_addr))
378 thread->dirty_card_queue().enqueue(card_addr); 378 thread->dirty_card_queue().enqueue(card_addr);
379 JRT_END 379 JRT_END
380 380
381 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread,oopDesc* parent, oopDesc* child)) 381 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child))
382 bool ret = true; 382 bool ret = true;
383 if(!Universe::heap()->is_in_closed_subset(parent)) { 383 if(!Universe::heap()->is_in_closed_subset(parent)) {
384 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent); 384 tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent);
385 parent->print(); 385 parent->print();
386 ret=false; 386 ret=false;