1.1 --- a/src/share/vm/adlc/output_h.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/adlc/output_h.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 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 @@ -386,14 +386,14 @@
1.11 static void defineCCodeDump(OperandForm* oper, FILE *fp, int i) {
1.12 assert(oper != NULL, "what");
1.13 CondInterface* cond = oper->_interface->is_CondInterface();
1.14 - fprintf(fp, " if( _c%d == BoolTest::eq ) st->print(\"%s\");\n",i,cond->_equal_format);
1.15 - fprintf(fp, " else if( _c%d == BoolTest::ne ) st->print(\"%s\");\n",i,cond->_not_equal_format);
1.16 - fprintf(fp, " else if( _c%d == BoolTest::le ) st->print(\"%s\");\n",i,cond->_less_equal_format);
1.17 - fprintf(fp, " else if( _c%d == BoolTest::ge ) st->print(\"%s\");\n",i,cond->_greater_equal_format);
1.18 - fprintf(fp, " else if( _c%d == BoolTest::lt ) st->print(\"%s\");\n",i,cond->_less_format);
1.19 - fprintf(fp, " else if( _c%d == BoolTest::gt ) st->print(\"%s\");\n",i,cond->_greater_format);
1.20 - fprintf(fp, " else if( _c%d == BoolTest::overflow ) st->print(\"%s\");\n",i,cond->_overflow_format);
1.21 - fprintf(fp, " else if( _c%d == BoolTest::no_overflow ) st->print(\"%s\");\n",i,cond->_no_overflow_format);
1.22 + fprintf(fp, " if( _c%d == BoolTest::eq ) st->print_raw(\"%s\");\n",i,cond->_equal_format);
1.23 + fprintf(fp, " else if( _c%d == BoolTest::ne ) st->print_raw(\"%s\");\n",i,cond->_not_equal_format);
1.24 + fprintf(fp, " else if( _c%d == BoolTest::le ) st->print_raw(\"%s\");\n",i,cond->_less_equal_format);
1.25 + fprintf(fp, " else if( _c%d == BoolTest::ge ) st->print_raw(\"%s\");\n",i,cond->_greater_equal_format);
1.26 + fprintf(fp, " else if( _c%d == BoolTest::lt ) st->print_raw(\"%s\");\n",i,cond->_less_format);
1.27 + fprintf(fp, " else if( _c%d == BoolTest::gt ) st->print_raw(\"%s\");\n",i,cond->_greater_format);
1.28 + fprintf(fp, " else if( _c%d == BoolTest::overflow ) st->print_raw(\"%s\");\n",i,cond->_overflow_format);
1.29 + fprintf(fp, " else if( _c%d == BoolTest::no_overflow ) st->print_raw(\"%s\");\n",i,cond->_no_overflow_format);
1.30 }
1.31
1.32 // Output code that dumps constant values, increment "i" if type is constant
1.33 @@ -416,8 +416,8 @@
1.34 ++i;
1.35 }
1.36 else if (!strcmp(ideal_type, "ConL")) {
1.37 - fprintf(fp," st->print(\"#\" INT64_FORMAT, _c%d);\n", i);
1.38 - fprintf(fp," st->print(\"/\" PTR64_FORMAT, _c%d);\n", i);
1.39 + fprintf(fp," st->print(\"#\" INT64_FORMAT, (int64_t)_c%d);\n", i);
1.40 + fprintf(fp," st->print(\"/\" PTR64_FORMAT, (uint64_t)_c%d);\n", i);
1.41 ++i;
1.42 }
1.43 else if (!strcmp(ideal_type, "ConF")) {
1.44 @@ -429,7 +429,7 @@
1.45 else if (!strcmp(ideal_type, "ConD")) {
1.46 fprintf(fp," st->print(\"#%%f\", _c%d);\n", i);
1.47 fprintf(fp," jlong _c%dl = JavaValue(_c%d).get_jlong();\n", i, i);
1.48 - fprintf(fp," st->print(\"/\" PTR64_FORMAT, _c%dl);\n", i);
1.49 + fprintf(fp," st->print(\"/\" PTR64_FORMAT, (uint64_t)_c%dl);\n", i);
1.50 ++i;
1.51 }
1.52 else if (!strcmp(ideal_type, "Bool")) {
1.53 @@ -471,7 +471,7 @@
1.54 if ( string != NameList::_signal ) {
1.55 // Normal string
1.56 // Pass through to st->print
1.57 - fprintf(fp," st->print(\"%s\");\n", string);
1.58 + fprintf(fp," st->print_raw(\"%s\");\n", string);
1.59 } else {
1.60 // Replacement variable
1.61 const char *rep_var = oper._format->_rep_vars.iter();
1.62 @@ -542,7 +542,7 @@
1.63 if ( string != NameList::_signal ) {
1.64 // Normal string
1.65 // Pass through to st->print
1.66 - fprintf(fp," st->print(\"%s\");\n", string);
1.67 + fprintf(fp," st->print_raw(\"%s\");\n", string);
1.68 } else {
1.69 // Replacement variable
1.70 const char *rep_var = oper._format->_rep_vars.iter();
1.71 @@ -669,7 +669,7 @@
1.72 } else if( string == NameList::_signal2 ) // Raw program text
1.73 fputs(inst._format->_strings.iter(), fp);
1.74 else
1.75 - fprintf(fp,"st->print(\"%s\");\n", string);
1.76 + fprintf(fp,"st->print_raw(\"%s\");\n", string);
1.77 } // Done with all format strings
1.78 } // Done generating the user-defined portion of the format
1.79
1.80 @@ -696,13 +696,13 @@
1.81 default:
1.82 assert(0,"ShouldNotReachHere");
1.83 }
1.84 - fprintf(fp, " st->print_cr(\"\");\n" );
1.85 + fprintf(fp, " st->cr();\n" );
1.86 fprintf(fp, " if (_jvms) _jvms->format(ra, this, st); else st->print_cr(\" No JVM State Info\");\n" );
1.87 fprintf(fp, " st->print(\" # \");\n" );
1.88 fprintf(fp, " if( _jvms && _oop_map ) _oop_map->print_on(st);\n");
1.89 }
1.90 else if(inst.is_ideal_safepoint()) {
1.91 - fprintf(fp, " st->print(\"\");\n" );
1.92 + fprintf(fp, " st->print_raw(\"\");\n" );
1.93 fprintf(fp, " if (_jvms) _jvms->format(ra, this, st); else st->print_cr(\" No JVM State Info\");\n" );
1.94 fprintf(fp, " st->print(\" # \");\n" );
1.95 fprintf(fp, " if( _jvms && _oop_map ) _oop_map->print_on(st);\n");
