1.1 --- a/src/share/vm/c1/c1_LIR.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/c1/c1_LIR.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -1563,15 +1563,15 @@
1.11 } else if (is_virtual()) {
1.12 out->print("R%d", vreg_number());
1.13 } else if (is_single_cpu()) {
1.14 - out->print(as_register()->name());
1.15 + out->print("%s", as_register()->name());
1.16 } else if (is_double_cpu()) {
1.17 - out->print(as_register_hi()->name());
1.18 - out->print(as_register_lo()->name());
1.19 + out->print("%s", as_register_hi()->name());
1.20 + out->print("%s", as_register_lo()->name());
1.21 #if defined(X86)
1.22 } else if (is_single_xmm()) {
1.23 - out->print(as_xmm_float_reg()->name());
1.24 + out->print("%s", as_xmm_float_reg()->name());
1.25 } else if (is_double_xmm()) {
1.26 - out->print(as_xmm_double_reg()->name());
1.27 + out->print("%s", as_xmm_double_reg()->name());
1.28 } else if (is_single_fpu()) {
1.29 out->print("fpu%d", fpu_regnr());
1.30 } else if (is_double_fpu()) {
1.31 @@ -1583,9 +1583,9 @@
1.32 out->print("d%d", fpu_regnrLo() >> 1);
1.33 #else
1.34 } else if (is_single_fpu()) {
1.35 - out->print(as_float_reg()->name());
1.36 + out->print("%s", as_float_reg()->name());
1.37 } else if (is_double_fpu()) {
1.38 - out->print(as_double_reg()->name());
1.39 + out->print("%s", as_double_reg()->name());
1.40 #endif
1.41
1.42 } else if (is_illegal()) {
1.43 @@ -1611,9 +1611,9 @@
1.44 case T_LONG: out->print("lng:" JLONG_FORMAT, as_jlong()); break;
1.45 case T_FLOAT: out->print("flt:%f", as_jfloat()); break;
1.46 case T_DOUBLE: out->print("dbl:%f", as_jdouble()); break;
1.47 - case T_OBJECT: out->print("obj:0x%x", as_jobject()); break;
1.48 - case T_METADATA: out->print("metadata:0x%x", as_metadata());break;
1.49 - default: out->print("%3d:0x%x",type(), as_jdouble()); break;
1.50 + case T_OBJECT: out->print("obj:" INTPTR_FORMAT, p2i(as_jobject())); break;
1.51 + case T_METADATA: out->print("metadata:" INTPTR_FORMAT, p2i(as_metadata()));break;
1.52 + default: out->print("%3d:0x" UINT64_FORMAT_X, type(), (uint64_t)as_jlong()); break;
1.53 }
1.54 }
1.55
1.56 @@ -1629,7 +1629,7 @@
1.57 case times_8: out->print(" * 8"); break;
1.58 }
1.59 }
1.60 - out->print(" Disp: %d", _disp);
1.61 + out->print(" Disp: " INTX_FORMAT, _disp);
1.62 }
1.63
1.64 // debug output of block header without InstructionPrinter
1.65 @@ -1703,7 +1703,7 @@
1.66 } else {
1.67 out->print(" ");
1.68 }
1.69 - out->print(name()); out->print(" ");
1.70 + out->print("%s ", name());
1.71 print_instr(out);
1.72 if (info() != NULL) out->print(" [bci:%d]", info()->stack()->bci());
1.73 #ifdef ASSERT
1.74 @@ -1833,7 +1833,7 @@
1.75 // LIR_OpJavaCall
1.76 void LIR_OpJavaCall::print_instr(outputStream* out) const {
1.77 out->print("call: ");
1.78 - out->print("[addr: 0x%x]", address());
1.79 + out->print("[addr: " INTPTR_FORMAT "]", p2i(address()));
1.80 if (receiver()->is_valid()) {
1.81 out->print(" [recv: "); receiver()->print(out); out->print("]");
1.82 }
1.83 @@ -1844,7 +1844,7 @@
1.84
1.85 // LIR_OpLabel
1.86 void LIR_OpLabel::print_instr(outputStream* out) const {
1.87 - out->print("[label:0x%x]", _label);
1.88 + out->print("[label:" INTPTR_FORMAT "]", p2i(_label));
1.89 }
1.90
1.91 // LIR_OpArrayCopy
1.92 @@ -1911,7 +1911,7 @@
1.93 // LIR_Op1
1.94 void LIR_OpRTCall::print_instr(outputStream* out) const {
1.95 intx a = (intx)addr();
1.96 - out->print(Runtime1::name_for_address(addr()));
1.97 + out->print("%s", Runtime1::name_for_address(addr()));
1.98 out->print(" ");
1.99 tmp()->print(out);
1.100 }
1.101 @@ -1934,10 +1934,10 @@
1.102 } else if (stub() != NULL) {
1.103 out->print("[");
1.104 stub()->print_name(out);
1.105 - out->print(": 0x%x]", stub());
1.106 + out->print(": " INTPTR_FORMAT "]", p2i(stub()));
1.107 if (stub()->info() != NULL) out->print(" [bci:%d]", stub()->info()->stack()->bci());
1.108 } else {
1.109 - out->print("[label:0x%x] ", label());
1.110 + out->print("[label:" INTPTR_FORMAT "] ", p2i(label()));
1.111 }
1.112 if (ublock() != NULL) {
1.113 out->print("unordered: [B%d] ", ublock()->block_id());
1.114 @@ -2004,7 +2004,7 @@
1.115 tmp4()->print(out); out->print(" ");
1.116 out->print("[hdr:%d]", header_size()); out->print(" ");
1.117 out->print("[obj:%d]", object_size()); out->print(" ");
1.118 - out->print("[lbl:0x%x]", stub()->entry());
1.119 + out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
1.120 }
1.121
1.122 void LIR_OpRoundFP::print_instr(outputStream* out) const {
1.123 @@ -2037,7 +2037,7 @@
1.124 tmp3()->print(out); out->print(" ");
1.125 tmp4()->print(out); out->print(" ");
1.126 out->print("[type:0x%x]", type()); out->print(" ");
1.127 - out->print("[label:0x%x]", stub()->entry());
1.128 + out->print("[label:" INTPTR_FORMAT "]", p2i(stub()->entry()));
1.129 }
1.130
1.131
1.132 @@ -2074,7 +2074,7 @@
1.133 if (_scratch->is_valid()) {
1.134 _scratch->print(out); out->print(" ");
1.135 }
1.136 - out->print("[lbl:0x%x]", stub()->entry());
1.137 + out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
1.138 }
1.139
1.140 #ifdef ASSERT
1.141 @@ -2082,7 +2082,7 @@
1.142 print_condition(out, condition()); out->print(" ");
1.143 in_opr1()->print(out); out->print(" ");
1.144 in_opr2()->print(out); out->print(", \"");
1.145 - out->print(msg()); out->print("\"");
1.146 + out->print("%s", msg()); out->print("\"");
1.147 }
1.148 #endif
1.149
