# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1413398095 -7200
# Node ID f55f2d400797d992244c30444eef9b48b620a72f
# Parent  3498d73280c8cc43f5014e10584909748cb76712
Fix some format strings

diff -r 3498d73280c8 -r f55f2d400797 src/gpu/hsail/vm/gpu_hsail.cpp
--- a/src/gpu/hsail/vm/gpu_hsail.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/hsail/vm/gpu_hsail.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -251,7 +251,7 @@
             javaArgs.push_oop((oop) NULL);
             javaArgs.push_int(mh->size_of_parameters());
             if (TraceGPUInteraction) {
-              tty->print_cr("[HSAIL] Deoptimizing to host for workitem=%d (slot=%d) with deoptId=%d, frame=" INTPTR_FORMAT ", actionAndReason=%d", workitem, k, deoptId, hsailFrame, myActionReason);
+              tty->print_cr("[HSAIL] Deoptimizing to host for workitem=%d (slot=%d) with deoptId=%d, frame=" INTPTR_FORMAT ", actionAndReason=%d", workitem, k, deoptId, p2i(hsailFrame), myActionReason);
               // show the $d registers or stack slots containing references
               int maxOopBits = hsailFrame->num_d_regs() + hsailFrame->num_stack_slots();
               HSAILOopMapHelper oopMapHelper(oop_map_array);
@@ -260,11 +260,11 @@
                 if (oopMapHelper.is_oop(pc_offset, bit)) {
                   if (bit < hsailFrame->num_d_regs()) {
                     // show $d reg oop
-                    tty->print_cr("  oop $d%d = %p", bit, hsailFrame->get_oop_for_bit(bit));
+                    tty->print_cr("  oop $d%d = " INTPTR_FORMAT, bit, hsailFrame->get_oop_for_bit(bit));
                   } else {
                     // show stack slot oop
                     int stackOffset = (bit - hsailFrame->num_d_regs()) * 8;  // 8 bytes per stack slot
-                    tty->print_cr("  oop stk:%d = %p", stackOffset, hsailFrame->get_oop_for_bit(bit));
+                    tty->print_cr("  oop stk:%d = " INTPTR_FORMAT, stackOffset, hsailFrame->get_oop_for_bit(bit));
                   }
                 }
               }
@@ -460,7 +460,7 @@
 void Hsail::HSAILDeoptimizationInfo::oops_do(OopClosure* f) {
   int unprocessed_deopts = num_deopts() - deopt_work_index();
   if (TraceGPUInteraction) {
-    tty->print_cr("HSAILDeoptimizationInfo::oops_do deopt_occurred=%d, total_deopts=%d, unprocessed_deopts=%d, oop_map_array=%p", _deopt_occurred, num_deopts(), unprocessed_deopts, _oop_map_array);
+    tty->print_cr("HSAILDeoptimizationInfo::oops_do deopt_occurred=%d, total_deopts=%d, unprocessed_deopts=%d, oop_map_array=" INTPTR_FORMAT, _deopt_occurred, num_deopts(), unprocessed_deopts, p2i(_oop_map_array));
   }
   if (num_deopts() == 0 || unprocessed_deopts <= 0) {
     return; // nothing to do
diff -r 3498d73280c8 -r f55f2d400797 src/gpu/hsail/vm/hsailArgumentsBase.cpp
--- a/src/gpu/hsail/vm/hsailArgumentsBase.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/hsail/vm/hsailArgumentsBase.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -47,7 +47,7 @@
     oop arg = _args->obj_at(_index++);
     assert(arg->is_instance() && (!arg->is_array()), "First arg should be 'this'");
     if (TraceGPUInteraction) {
-      tty->print_cr("[HSAIL] %s, instance method, this " PTR_FORMAT ", is a %s", argsBuilderName(), (address) arg, arg->klass()->external_name());
+      tty->print_cr("[HSAIL] %s, instance method, this " INTPTR_FORMAT ", is a %s", argsBuilderName(), p2i(arg), arg->klass()->external_name());
     }
     pushObject(arg);
   } else {
@@ -139,7 +139,7 @@
   jvalue jValue;
   java_lang_boxing_object::get_value(arg, &jValue);
   if (TraceGPUInteraction) {
-    tty->print_cr("[HSAIL] %s::do_long, _index=%d, value = %d", argsBuilderName(), _index - 1, jValue.j);
+    tty->print_cr("[HSAIL] %s::do_long, _index=%d, value = " JLONG_FORMAT, argsBuilderName(), _index - 1, jValue.j);
   }    
 
   pushLong(jValue.j);
@@ -153,7 +153,7 @@
       assert(arg->is_array(), "arg type mismatch");
   }
   if (TraceGPUInteraction) {
-    tty->print_cr("[HSAIL] %s::do_array, _index=%d, 0x%08x, is a %s", argsBuilderName(), _index - 1, (address) arg,
+    tty->print_cr("[HSAIL] %s::do_array, _index=%d, 0x" INTPTR_FORMAT ", is a %s", argsBuilderName(), _index - 1, p2i(arg),
                   arg == NULL ? "null" : arg->klass()->external_name());
   }
     
@@ -165,7 +165,7 @@
 
   oop arg = _args->obj_at(_index++);
   if (TraceGPUInteraction) {
-    tty->print_cr("[HSAIL] %s::do_object, _index=%d, 0x%08x is a %s", argsBuilderName(), _index - 1, (address) arg,
+    tty->print_cr("[HSAIL] %s::do_object, _index=%d, 0x" INTPTR_FORMAT " is a %s", argsBuilderName(), _index - 1, p2i(arg),
                   arg == NULL ? "null" : arg->klass()->external_name());
   }
   if (arg == NULL) {
diff -r 3498d73280c8 -r f55f2d400797 src/gpu/hsail/vm/hsailJavaCallArguments.hpp
--- a/src/gpu/hsail/vm/hsailJavaCallArguments.hpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/hsail/vm/hsailJavaCallArguments.hpp	Wed Oct 15 20:34:55 2014 +0200
@@ -68,8 +68,8 @@
       objArrayOop objArrayArg = (objArrayOop) arg;
       oop extractedObj = objArrayArg->obj_at(_workitemid);
       if (TraceGPUInteraction) {
-        tty->print_cr("[HSAIL] HSAILJavaCallArguments, extracted obj #%d from array, 0x%08x is a %s",
-                      _workitemid, (address) extractedObj,
+        tty->print_cr("[HSAIL] HSAILJavaCallArguments, extracted obj #%d from array, " INTPTR_FORMAT " is a %s",
+                      _workitemid, p2i(extractedObj),
                       (extractedObj == NULL ? "null" : extractedObj->klass()->external_name()));
       }
       pushObject(extractedObj);
diff -r 3498d73280c8 -r f55f2d400797 src/gpu/hsail/vm/hsailKernelArguments.cpp
--- a/src/gpu/hsail/vm/hsailKernelArguments.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/hsail/vm/hsailKernelArguments.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -36,7 +36,7 @@
     jvalue jValue;
     if (arg == NULL) {
       if (TraceGPUInteraction) {
-        tty->print_cr("[HSAIL] %s::collectArgs object, _index=%d, value = " PTR_FORMAT " is a %s", argsBuilderName(), index, (void*) arg, "null");
+        tty->print_cr("[HSAIL] %s::collectArgs object, _index=%d, value = " PTR_FORMAT " is a %s", argsBuilderName(), index, p2i(arg), "null");
       }
       recordNullObjectParameter();
       pushObject(arg);
@@ -45,13 +45,13 @@
       BasicType basic_type = java_lang_boxing_object::basic_type(arg);
       if (basic_type == T_ILLEGAL && (!(arg->is_array()))) {
         if (TraceGPUInteraction) {
-          tty->print_cr("[HSAIL] %s::collectArgs object, _index=%d, value = " PTR_FORMAT " is a %s", argsBuilderName(), index, (void*) arg, arg == NULL ? "null" : arg->klass()->external_name());
+          tty->print_cr("[HSAIL] %s::collectArgs object, _index=%d, value = " PTR_FORMAT " is a %s", argsBuilderName(), index, p2i(arg), arg == NULL ? "null" : arg->klass()->external_name());
         }
         pushObject(arg);
       } else if (arg->is_array()) {
         if (TraceGPUInteraction) {
           int array_length = ((objArrayOop) arg)->length();
-          tty->print_cr("[HSAIL] %s::collectArgs array, length=%d, _index=%d, value = " PTR_FORMAT, argsBuilderName(), array_length, index, (void*) arg);
+          tty->print_cr("[HSAIL] %s::collectArgs array, length=%d, _index=%d, value = " PTR_FORMAT, argsBuilderName(), array_length, index, p2i(arg));
         }
         pushObject(arg);
       } else {
@@ -64,19 +64,19 @@
             break;
           case T_LONG:
             if (TraceGPUInteraction) {
-              tty->print_cr("[HSAIL] %s::collectArgs, T_LONG _index=%d, value = %d", argsBuilderName(), index, jValue.j);
+              tty->print_cr("[HSAIL] %s::collectArgs, T_LONG _index=%d, value = " JLONG_FORMAT, argsBuilderName(), index, jValue.j);
             }
             pushLong(jValue.j);
             break;
           case T_FLOAT:
             if (TraceGPUInteraction) {
-              tty->print_cr("[HSAIL] %s::collectArgs, T_FLOAT _index=%d, value = %d", argsBuilderName(), index, jValue.f);
+              tty->print_cr("[HSAIL] %s::collectArgs, T_FLOAT _index=%d, value = %f", argsBuilderName(), index, jValue.f);
             }
             pushFloat(jValue.f);
             break;
           case T_DOUBLE:
             if (TraceGPUInteraction) {
-              tty->print_cr("[HSAIL] %s::collectArgs, T_DOUBLE _index=%d, value = %d", argsBuilderName(), index, jValue.d);
+              tty->print_cr("[HSAIL] %s::collectArgs, T_DOUBLE _index=%d, value = %lf", argsBuilderName(), index, jValue.d);
             }
             pushDouble(jValue.d);
             break;
diff -r 3498d73280c8 -r f55f2d400797 src/gpu/hsail/vm/hsailKernelArguments.hpp
--- a/src/gpu/hsail/vm/hsailKernelArguments.hpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/hsail/vm/hsailKernelArguments.hpp	Wed Oct 15 20:34:55 2014 +0200
@@ -82,7 +82,7 @@
         if (UseHSAILDeoptimization) {
             // Last argument is the exception info block
             if (TraceGPUInteraction) {
-                tty->print_cr("[HSAIL] exception block=" PTR_FORMAT, _exceptionHolder);
+                tty->print_cr("[HSAIL] exception block=" INTPTR_FORMAT, p2i(_exceptionHolder));
             }
             pushObject(_exceptionHolder);
         }
diff -r 3498d73280c8 -r f55f2d400797 src/gpu/ptx/vm/gpu_ptx.cpp
--- a/src/gpu/ptx/vm/gpu_ptx.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/gpu/ptx/vm/gpu_ptx.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -470,7 +470,7 @@
       char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, O_BUFLEN + 1);
       jio_snprintf(message, O_BUFLEN, "[CUDA] *** Error (status=%d): %s", status, action);
       if (TraceGPUInteraction) {
-        tty->print_cr(message);
+        tty->print_raw_cr(message);
       }
       if (!HAS_PENDING_EXCEPTION) {
         SharedRuntime::throw_and_post_jvmti_exception(_thread, vmSymbols::java_lang_RuntimeException(), message);
@@ -641,7 +641,7 @@
     if (obj != NULL) {
       char type[256];
       obj->klass()->name()->as_C_string(type, 256);
-      _st->print("oop "PTR_FORMAT" (%s)", (address) obj, type);
+      _st->print("oop "INTPTR_FORMAT" (%s)", p2i(obj), type);
     } else {
       _st->print("oop null");
     }
@@ -688,7 +688,7 @@
       _device_context = NULL;
       } else {
         if (TraceGPUInteraction) {
-          tty->print_cr("[CUDA] Destroyed context", status);
+          tty->print_cr("[CUDA] Destroyed context");
         }
       }
     }
diff -r 3498d73280c8 -r f55f2d400797 src/share/vm/graal/graalCodeInstaller.cpp
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -155,20 +155,20 @@
   if (obj->is_a(HotSpotResolvedObjectType::klass())) {
     Klass* klass = java_lang_Class::as_Klass(HotSpotResolvedObjectType::javaClass(obj));
     if (compressed) {
-      assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim));
+      assert(Klass::decode_klass((narrowKlass) prim) == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
     } else {
-      assert((Klass*) prim == klass, err_msg("%s @ %p != %p", klass->name()->as_C_string(), klass, prim));
+      assert((Klass*) prim == klass, err_msg("%s @ " INTPTR_FORMAT " != " INTPTR_FORMAT, klass->name()->as_C_string(), p2i(klass), prim));
     }
     int index = oop_recorder->find_index(klass);
     TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), klass->name()->as_C_string());
   } else if (obj->is_a(HotSpotResolvedJavaMethod::klass())) {
     Method* method = (Method*) (address) HotSpotResolvedJavaMethod::metaspaceMethod(obj);
-    assert(!compressed, err_msg("unexpected compressed method pointer %s @ %p = %p", method->name()->as_C_string(), method, prim));
+    assert(!compressed, err_msg("unexpected compressed method pointer %s @ " INTPTR_FORMAT " = " INTPTR_FORMAT, method->name()->as_C_string(), p2i(method), prim));
     int index = oop_recorder->find_index(method);
     TRACE_graal_3("metadata[%d of %d] = %s", index, oop_recorder->metadata_count(), method->name()->as_C_string());
   } else {
     assert(java_lang_String::is_instance(obj),
-        err_msg("unexpected metadata reference (%s) for constant %ld (%p)", obj->klass()->name()->as_C_string(), prim, prim));
+        err_msg("unexpected metadata reference (%s) for constant " JLONG_FORMAT " (" INTPTR_FORMAT ")", obj->klass()->name()->as_C_string(), prim, prim));
   }
 }
 
@@ -451,7 +451,7 @@
 
   if (cb != NULL) {
     // Make sure the pre-calculated constants section size was correct.
-    guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", cb->code_begin() - cb->content_begin(), _constants_size));
+    guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", (int)(cb->code_begin() - cb->content_begin()), _constants_size));
   }
   return result;
 }
diff -r 3498d73280c8 -r f55f2d400797 src/share/vm/graal/graalCompiler.cpp
--- a/src/share/vm/graal/graalCompiler.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/graal/graalCompiler.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -111,7 +111,7 @@
   } while (qsize != 0);
 
   if (PrintBootstrap) {
-    tty->print_cr(" in %d ms (compiled %d methods)", os::javaTimeMillis() - start, _methodsCompiled);
+    tty->print_cr(" in " JLONG_FORMAT " ms (compiled %d methods)", os::javaTimeMillis() - start, _methodsCompiled);
   }
   _bootstrapping = false;
 #ifndef PRODUCT
diff -r 3498d73280c8 -r f55f2d400797 src/share/vm/graal/graalCompilerToVM.cpp
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -466,7 +466,7 @@
       CodeCache::print_summary(&s, false);
     }
     ttyLocker ttyl;
-    tty->print_cr(s.as_string());
+    tty->print_raw_cr(s.as_string());
   }
 
   if (result != GraalEnv::ok) {
diff -r 3498d73280c8 -r f55f2d400797 src/share/vm/graal/graalRuntime.cpp
--- a/src/share/vm/graal/graalRuntime.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/graal/graalRuntime.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -355,9 +355,8 @@
     if (TraceExceptions) {
       ttyLocker ttyl;
       ResourceMark rm;
-      int offset = pc - nm->code_begin();
-      tty->print_cr("Exception <%s> (0x%x) thrown in compiled method <%s> at PC " PTR_FORMAT " [" PTR_FORMAT "+%d] for thread 0x%x",
-                    exception->print_value_string(), (address)exception(), nm->method()->print_value_string(), pc, nm->code_begin(), offset, thread);
+      tty->print_cr("Exception <%s> (" INTPTR_FORMAT ") thrown in compiled method <%s> at PC " INTPTR_FORMAT " for thread " INTPTR_FORMAT "",
+                    exception->print_value_string(), p2i((address)exception()), nm->method()->print_value_string(), p2i(pc), p2i(thread));
     }
     // for AbortVMOnException flag
     NOT_PRODUCT(Exceptions::debug_check_abort(exception));
@@ -366,8 +365,7 @@
     // exception handler can cause class loading, which might throw an
     // exception and those fields are expected to be clear during
     // normal bytecode execution.
-    thread->set_exception_oop(NULL);
-    thread->set_exception_pc(NULL);
+    thread->clear_exception_oop_and_pc();
 
     continuation = SharedRuntime::compute_compiled_exc_handler(nm, pc, exception, false, false);
     // If an exception was thrown during exception dispatch, the exception oop may have changed
@@ -387,7 +385,7 @@
     ttyLocker ttyl;
     ResourceMark rm;
     tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT,
-                  thread, continuation, pc);
+                  p2i(thread), p2i(continuation), p2i(pc));
   }
 
   return continuation;
@@ -441,7 +439,7 @@
     char type[O_BUFLEN];
     obj->klass()->name()->as_C_string(type, O_BUFLEN);
     markOop mark = obj->mark();
-    tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), obj, type, mark, lock);
+    tty->print_cr("%s: entered locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(mark), p2i(lock));
     tty->flush();
   }
 #ifdef ASSERT
@@ -463,7 +461,7 @@
     }
   }
   if (TraceGraal >= 3) {
-    tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), obj);
+    tty->print_cr("%s: exiting locking slow with obj=" INTPTR_FORMAT, thread->name(), p2i(obj));
   }
 JRT_END
 
@@ -478,7 +476,7 @@
     ResetNoHandleMark rhm;
     nmethod* method = thread->last_frame().cb()->as_nmethod_or_null();
     if (method != NULL) {
-      tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), obj);
+      tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), p2i(obj));
     }
     thread->print_stack_on(tty);
     assert(false, "invalid lock object pointer dected");
@@ -494,7 +492,7 @@
   if (TraceGraal >= 3) {
     char type[O_BUFLEN];
     obj->klass()->name()->as_C_string(type, O_BUFLEN);
-    tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), obj, type, obj->mark(), lock);
+    tty->print_cr("%s: exited locking slow case with obj=" INTPTR_FORMAT ", type=%s, mark=" INTPTR_FORMAT ", lock=" INTPTR_FORMAT, thread->name(), p2i(obj), type, p2i(obj->mark()), p2i(lock));
     tty->flush();
   }
 JRT_END
@@ -506,15 +504,15 @@
   if (!string) {
     if (!addr && obj->is_oop_or_null(true)) {
       char buf[O_BUFLEN];
-      tty->print("%s@%p", obj->klass()->name()->as_C_string(buf, O_BUFLEN), (address)obj);
+      tty->print("%s@" INTPTR_FORMAT, obj->klass()->name()->as_C_string(buf, O_BUFLEN), p2i(obj));
     } else {
-      tty->print("%p", (address)obj);
+      tty->print(INTPTR_FORMAT, p2i(obj));
     }
   } else {
     ResourceMark rm;
     assert(obj != NULL && java_lang_String::is_instance(obj), "must be");
     char *buf = java_lang_String::as_utf8_string(obj);
-    tty->print(buf);
+    tty->print_raw(buf);
   }
   if (newline) {
     tty->cr();
@@ -532,12 +530,12 @@
 JRT_LEAF(jboolean, GraalRuntime::validate_object(JavaThread* thread, oopDesc* parent, oopDesc* child))
   bool ret = true;
   if(!Universe::heap()->is_in_closed_subset(parent)) {
-    tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", parent);
+    tty->print_cr("Parent Object "INTPTR_FORMAT" not in heap", p2i(parent));
     parent->print();
     ret=false;
   }
   if(!Universe::heap()->is_in_closed_subset(child)) {
-    tty->print_cr("Child Object "INTPTR_FORMAT" not in heap", child);
+    tty->print_cr("Child Object "INTPTR_FORMAT" not in heap", p2i(child));
     child->print();
     ret=false;
   }
@@ -579,7 +577,7 @@
     if (cb) {
       if (cb->is_nmethod()) {
         char buf[O_BUFLEN];
-        tty->print("%s [%p+%d]", cb->as_nmethod_or_null()->method()->name_and_sig_as_C_string(buf, O_BUFLEN), cb->code_begin(), (address)v - cb->code_begin());
+        tty->print("%s [" INTPTR_FORMAT "+" JLONG_FORMAT "]", cb->as_nmethod_or_null()->method()->name_and_sig_as_C_string(buf, O_BUFLEN), p2i(cb->code_begin()), (jlong)((address)v - cb->code_begin()));
         return;
       }
       cb->print_value_on(tty);
@@ -590,7 +588,7 @@
       obj->print_value_on(tty);
       return;
     }
-    tty->print("%p [long: %d, double %f, char %c]", v, v, v, v);
+    tty->print(INTPTR_FORMAT " [long: " JLONG_FORMAT ", double %lf, char %c]",p2i((void *)v), (jlong)v, (jdouble)v, (char)v);
   }
 }
 
@@ -850,7 +848,7 @@
       if (num_read == -1) {
         warning("Error reading file %s due to %s", path, strerror(errno));
       } else if (num_read != st.st_size) {
-        warning("Only read %d of %d bytes from %s", num_read, st.st_size, path);
+        warning("Only read %d of " SIZE_FORMAT " bytes from %s", num_read, st.st_size, path);
       }
       os::close(file_handle);
       if (num_read == st.st_size) {
@@ -1026,7 +1024,7 @@
 void GraalRuntime::abort_on_pending_exception(Handle exception, const char* message, bool dump_core) {
   Thread* THREAD = Thread::current();
   CLEAR_PENDING_EXCEPTION;
-  tty->print_cr(message);
+  tty->print_raw_cr(message);
   call_printStackTrace(exception, THREAD);
 
   // Give other aborting threads to also print their stack traces.
diff -r 3498d73280c8 -r f55f2d400797 src/share/vm/runtime/vframeArray.cpp
--- a/src/share/vm/runtime/vframeArray.cpp	Thu Oct 16 10:50:27 2014 +0200
+++ b/src/share/vm/runtime/vframeArray.cpp	Wed Oct 15 20:34:55 2014 +0200
@@ -340,7 +340,7 @@
           if (o == NULL) {
             tty->print_cr("NULL");
           } else {
-            tty->print_cr(err_msg("%s", o->klass()->name()->as_C_string()));
+            tty->print_raw_cr(err_msg("%s", o->klass()->name()->as_C_string()));
           }
         }
 #endif
@@ -377,7 +377,7 @@
           if (o == NULL) {
             tty->print_cr("NULL");
           } else {
-            tty->print_cr(err_msg("%s", o->klass()->name()->as_C_string()));
+            tty->print_raw_cr(err_msg("%s", o->klass()->name()->as_C_string()));
           }
         }
 #endif