Mercurial > hg > truffle
comparison src/share/vm/runtime/safepoint.cpp @ 12873:4e7f99b70d9d
Merge
author | adlertz |
---|---|
date | Wed, 09 Oct 2013 05:03:34 -0700 |
parents | 268e7a2178d7 |
children | cefad50507d8 63a4eb8bcd23 f42c10a3d4b1 |
comparison
equal
deleted
inserted
replaced
12872:98692a2d36d7 | 12873:4e7f99b70d9d |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
743 #else | 743 #else |
744 #define PTR_PAD " " | 744 #define PTR_PAD " " |
745 #endif | 745 #endif |
746 | 746 |
747 static void print_ptrs(intptr_t oldptr, intptr_t newptr, bool wasoop) { | 747 static void print_ptrs(intptr_t oldptr, intptr_t newptr, bool wasoop) { |
748 bool is_oop = newptr ? ((oop)newptr)->is_oop() : false; | 748 bool is_oop = newptr ? (cast_to_oop(newptr))->is_oop() : false; |
749 tty->print_cr(PTR_FORMAT PTR_PAD " %s %c " PTR_FORMAT PTR_PAD " %s %s", | 749 tty->print_cr(PTR_FORMAT PTR_PAD " %s %c " PTR_FORMAT PTR_PAD " %s %s", |
750 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!', | 750 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!', |
751 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" ")); | 751 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" ")); |
752 } | 752 } |
753 | 753 |
754 static void print_longs(jlong oldptr, jlong newptr, bool wasoop) { | 754 static void print_longs(jlong oldptr, jlong newptr, bool wasoop) { |
755 bool is_oop = newptr ? ((oop)(intptr_t)newptr)->is_oop() : false; | 755 bool is_oop = newptr ? (cast_to_oop(newptr))->is_oop() : false; |
756 tty->print_cr(PTR64_FORMAT " %s %c " PTR64_FORMAT " %s %s", | 756 tty->print_cr(PTR64_FORMAT " %s %c " PTR64_FORMAT " %s %s", |
757 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!', | 757 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!', |
758 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" ")); | 758 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" ")); |
759 } | 759 } |
760 | 760 |