# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
# Date 1298312915 -3600
# Node ID d9e4d0aefc901bab66ee5051b8ccbd2668f5f0a4
# Parent  0cd39a385a7236a9e3ed78fbb26723a626bed509
Small clean up to reduce delta to OpenJDK.

diff -r 0cd39a385a72 -r d9e4d0aefc90 src/cpu/x86/vm/assembler_x86.cpp
--- a/src/cpu/x86/vm/assembler_x86.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/cpu/x86/vm/assembler_x86.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -5544,7 +5544,6 @@
   lea(c_rarg1, InternalAddress(rip));
   movq(c_rarg2, rsp); // pass pointer to regs array
   andq(rsp, -16); // align stack as required by ABI
-  mov64(rax, 0);
   call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64)));
   hlt();
 }
@@ -5555,7 +5554,6 @@
 
   push_CPU_state();   // keeps alignment at 16 bytes
   lea(c_rarg0, ExternalAddress((address) msg));
-  mov64(rax, 0);
   call_VM_leaf(CAST_FROM_FN_PTR(address, warning), c_rarg0);
   pop_CPU_state();
   pop(rsp);
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/cpu/x86/vm/frame_x86.cpp
--- a/src/cpu/x86/vm/frame_x86.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/cpu/x86/vm/frame_x86.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -235,9 +235,6 @@
   if (TracePcPatching) {
     tty->print_cr("patch_pc at address" INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "] ",
                   &((address *)sp())[-1], ((address *)sp())[-1], pc);
-    tty->print_cr("sp[0]: " INTPTR_FORMAT, ((intptr_t*)sp())[0]);
-    tty->print_cr("sp[1]: " INTPTR_FORMAT, ((intptr_t*)sp())[1]);
-    tty->print_cr("sp[2]: " INTPTR_FORMAT, ((intptr_t*)sp())[2]);
   }
   ((address *)sp())[-1] = pc;
   _cb = CodeCache::find_blob(pc);
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/classfile/vmSymbols.hpp
--- a/src/share/vm/classfile/vmSymbols.hpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/classfile/vmSymbols.hpp	Mon Feb 21 19:28:35 2011 +0100
@@ -421,7 +421,6 @@
   template(erasedType_name,                           "erasedType")                               \
   template(genericInvoker_name,                       "genericInvoker")                           \
   template(append_name,                               "append")                                   \
-  template(id_name,                                   "id")                                       \
                                                                                                   \
   /* non-intrinsic name/signature pairs: */                                                       \
   template(register_method_name,                      "register")                                 \
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/code/nmethod.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -2592,7 +2592,6 @@
   if (block_begin == entry_point())             stream->print_cr("[Entry Point]");
   if (block_begin == verified_entry_point())    stream->print_cr("[Verified Entry Point]");
   if (block_begin == exception_begin())         stream->print_cr("[Exception Handler]");
-  if (block_begin == unwind_handler_begin())    stream->print_cr("[Unwind Handler]");
   if (block_begin == stub_begin())              stream->print_cr("[Stub Code]");
   if (block_begin == deopt_handler_begin())     stream->print_cr("[Deopt Handler Code]");
 
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/code/pcDesc.cpp
--- a/src/share/vm/code/pcDesc.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/code/pcDesc.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -44,7 +44,7 @@
 void PcDesc::print(nmethod* code) {
 #ifndef PRODUCT
   ResourceMark rm;
-  tty->print_cr("PcDesc(pc=0x%lx offset=%d):", real_pc(code), pc_offset());
+  tty->print_cr("PcDesc(pc=0x%lx offset=%x):", real_pc(code), pc_offset());
 
   if (scope_decode_offset() == DebugInformationRecorder::serialized_null) {
     return;
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/oops/instanceKlass.cpp
--- a/src/share/vm/oops/instanceKlass.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/oops/instanceKlass.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -620,9 +620,7 @@
 }
 
 objArrayOop instanceKlass::allocate_objArray(int n, int length, TRAPS) {
-  if (length < 0) {
-    THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
-  }
+  if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
   if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
     report_java_out_of_memory("Requested array size exceeds VM limit");
     THROW_OOP_0(Universe::out_of_memory_error_array_size());
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/oops/oop.inline.hpp
--- a/src/share/vm/oops/oop.inline.hpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/oops/oop.inline.hpp	Mon Feb 21 19:28:35 2011 +0100
@@ -569,8 +569,8 @@
 // used only for asserts
 inline bool oopDesc::is_oop(bool ignore_mark_word) const {
   oop obj = (oop) this;
-  if (!check_obj_alignment(obj)) { tty->print_cr("unaligned"); return false; }
-  if (!Universe::heap()->is_in_reserved(obj)) { tty->print_cr("not in reserved"); return false; }
+  if (!check_obj_alignment(obj)) return false;
+  if (!Universe::heap()->is_in_reserved(obj)) return false;
   // obj is aligned and accessible in heap
   // try to find metaclass cycle safely without seg faulting on bad input
   // we should reach klassKlassObj by following klass link at most 3 times
diff -r 0cd39a385a72 -r d9e4d0aefc90 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Mon Feb 21 19:17:33 2011 +0100
+++ b/src/share/vm/prims/jni.cpp	Mon Feb 21 19:28:35 2011 +0100
@@ -3353,7 +3353,6 @@
 
     // Check if we should compile all classes on bootclasspath
     NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
-
     // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
     ThreadStateTransition::transition_and_fence(thread, _thread_in_vm, _thread_in_native);
   } else {