1.1 --- a/src/share/vm/c1/c1_InstructionPrinter.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/c1/c1_InstructionPrinter.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 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 @@ -134,23 +134,23 @@
1.11 if (value->is_null_object()) {
1.12 output()->print("null");
1.13 } else if (!value->is_loaded()) {
1.14 - output()->print("<unloaded object " PTR_FORMAT ">", value);
1.15 + output()->print("<unloaded object " INTPTR_FORMAT ">", p2i(value));
1.16 } else {
1.17 - output()->print("<object " PTR_FORMAT " klass=", value->constant_encoding());
1.18 + output()->print("<object " INTPTR_FORMAT " klass=", p2i(value->constant_encoding()));
1.19 print_klass(value->klass());
1.20 output()->print(">");
1.21 }
1.22 } else if (type->as_InstanceConstant() != NULL) {
1.23 ciInstance* value = type->as_InstanceConstant()->value();
1.24 if (value->is_loaded()) {
1.25 - output()->print("<instance " PTR_FORMAT " klass=", value->constant_encoding());
1.26 + output()->print("<instance " INTPTR_FORMAT " klass=", p2i(value->constant_encoding()));
1.27 print_klass(value->klass());
1.28 output()->print(">");
1.29 } else {
1.30 - output()->print("<unloaded instance " PTR_FORMAT ">", value);
1.31 + output()->print("<unloaded instance " INTPTR_FORMAT ">", p2i(value));
1.32 }
1.33 } else if (type->as_ArrayConstant() != NULL) {
1.34 - output()->print("<array " PTR_FORMAT ">", type->as_ArrayConstant()->value()->constant_encoding());
1.35 + output()->print("<array " INTPTR_FORMAT ">", p2i(type->as_ArrayConstant()->value()->constant_encoding()));
1.36 } else if (type->as_ClassConstant() != NULL) {
1.37 ciInstanceKlass* klass = type->as_ClassConstant()->value();
1.38 if (!klass->is_loaded()) {
1.39 @@ -268,7 +268,7 @@
1.40
1.41
1.42 void InstructionPrinter::print_unsafe_op(UnsafeOp* op, const char* name) {
1.43 - output()->print(name);
1.44 + output()->print("%s", name);
1.45 output()->print(".(");
1.46 }
1.47
1.48 @@ -479,7 +479,7 @@
1.49 if (x->declared_type()->is_klass())
1.50 print_klass(x->declared_type()->as_klass());
1.51 else
1.52 - output()->print(type2name(x->declared_type()->basic_type()));
1.53 + output()->print("%s", type2name(x->declared_type()->basic_type()));
1.54 }
1.55
1.56
