Mercurial > hg > release > icedtea6-1.7

changeset 1712:79039da1a614

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-09-16 Gary Benson <gbenson@redhat.com> * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp: * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp: * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp: * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp: * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp: * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp: * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: * ports/hotspot/src/cpu/zero/vm/register_zero.cpp: * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp: * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp: * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp: Replaced calls to "Unimplemented()" in stubs with calls to "ShouldNotCallThis()".
author Gary Benson <gbenson@redhat.com>
date Wed, 16 Sep 2009 05:36:53 -0400
parents 260b65087a73
children ea0d2d9445ce
files ChangeLog ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ports/hotspot/src/cpu/zero/vm/debug_zero.cpp ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp ports/hotspot/src/cpu/zero/vm/dump_zero.cpp ports/hotspot/src/cpu/zero/vm/frame_zero.cpp ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp ports/hotspot/src/cpu/zero/vm/icache_zero.cpp ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp ports/hotspot/src/cpu/zero/vm/register_zero.cpp ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
diffstat 21 files changed, 185 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Sep 15 12:47:59 2009 -0400
+++ b/ChangeLog	Wed Sep 16 05:36:53 2009 -0400
@@ -1,3 +1,28 @@
+2009-09-16  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp:
+	* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/register_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp:
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
+	* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
+	Replaced calls to "Unimplemented()" in stubs with calls to
+	"ShouldNotCallThis()".
+
 2009-09-15  Deepak Bhole  <dbhole@redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -31,12 +31,12 @@
 }
 
 void Assembler::pd_patch_instruction(address branch, address target) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 #ifndef PRODUCT
 void Assembler::pd_print_patched_instruction(address branch) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 #endif // PRODUCT
 
@@ -46,7 +46,7 @@
 }
 
 void MacroAssembler::bang_stack_with_offset(int offset) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void MacroAssembler::advance(int bytes) {
@@ -59,22 +59,14 @@
   emit_address((address) obj);
 }
 
-static void _UnimplementedStub() {
-  report_unimplemented(__FILE__, __LINE__);
-}
-
-address UnimplementedStub() {
-  return (address) _UnimplementedStub;
+static void should_not_call() {
+  report_should_not_call(__FILE__, __LINE__);
 }
 
-address UnimplementedEntry() {
-  return (address) _UnimplementedStub;
+address ShouldNotCallThisStub() {
+  return (address) should_not_call;
 }
 
-static void _ShouldNotReachHereStub() {
-  report_should_not_reach_here(__FILE__, __LINE__);
+address ShouldNotCallThisEntry() {
+  return (address) should_not_call;
 }
-
-address ShouldNotReachHereStub() {
-  return (address) _ShouldNotReachHereStub;
-}
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -32,6 +32,7 @@
  public:
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {}
 
+ public:
   void pd_patch_instruction(address branch, address target);
 #ifndef PRODUCT
   static void pd_print_patched_instruction(address branch);
@@ -42,6 +43,7 @@
  public:
   MacroAssembler(CodeBuffer* code) : Assembler(code) {}
 
+ public:
   void align(int modulus);
   void bang_stack_with_offset(int offset);
   bool needs_explicit_null_check(intptr_t offset);
@@ -53,13 +55,12 @@
 
 #ifdef ASSERT
 inline bool AbstractAssembler::pd_check_instruction_mark() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 #endif
 
-address UnimplementedStub();
-address UnimplementedEntry();
-address ShouldNotReachHereStub();
+address ShouldNotCallThisStub();
+address ShouldNotCallThisEntry();
 
 // Nothing to do with the assembler (or lack of),
 // just a real convenient place to include these.
--- a/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -1,6 +1,6 @@
 /*
  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
  */
 
 typedef union unaligned {
-	u4	u;
-	u2	us;
-	u8	ul;
+  u4 u;
+  u2 us;
+  u8 ul;
 } __attribute__((packed)) unaligned;
 
 class Bytes: AllStatic {
@@ -43,51 +43,60 @@
 
   // Efficient reading and writing of unaligned unsigned data in
   // platform-specific byte ordering.
-  static inline u2   get_native_u2(address p){
-	unaligned *up = (unaligned *)p;
-	return up->us;
+  static inline u2 get_native_u2(address p){
+    unaligned *up = (unaligned *) p;
+    return up->us;
   }
 
-  static inline u4   get_native_u4(address p) {
-	unaligned *up = (unaligned *)p;
-	return up->u;
+  static inline u4 get_native_u4(address p) {
+    unaligned *up = (unaligned *) p;
+    return up->u;
   }
 
-  static inline u8   get_native_u8(address p) {
-	unaligned *up = (unaligned *)p;
-	return up->ul;
+  static inline u8 get_native_u8(address p) {
+    unaligned *up = (unaligned *) p;
+    return up->ul;
   }
 
   static inline void put_native_u2(address p, u2 x) {
-	unaligned *up = (unaligned *)p;
-	up->us = x;
+    unaligned *up = (unaligned *) p;
+    up->us = x;
   }
 
   static inline void put_native_u4(address p, u4 x) {
-	unaligned *up = (unaligned *)p;
-	up->u = x;
+    unaligned *up = (unaligned *) p;
+    up->u = x;
   }
 
   static inline void put_native_u8(address p, u8 x) {
-	unaligned *up = (unaligned *)p;
-	up->ul = x;
+    unaligned *up = (unaligned *) p;
+    up->ul = x;
   }
 
-
   // Efficient reading and writing of unaligned unsigned data in Java
   // byte ordering (i.e. big-endian ordering).
 #ifdef VM_LITTLE_ENDIAN
   // Byte-order reversal is needed
   static inline u2 get_Java_u2(address p) {
-    return ( u2(p[0]) << 8 ) | ( u2(p[1])      );
+    return (u2(p[0]) << 8) |
+           (u2(p[1])     );
   }
   static inline u4 get_Java_u4(address p) {
-    return ( u4(p[0]) << 24 ) | ( u4(p[1]) << 16 ) | ( u4(p[2]) << 8 ) | ( u4(p[3]) );
+    return (u4(p[0]) << 24) |
+           (u4(p[1]) << 16) |
+           (u4(p[2]) <<  8) |
+           (u4(p[3])      );
   }
   static inline u8 get_Java_u8(address p) {
     u4 hi, lo;
-    hi = ( u4(p[0]) << 24 ) | ( u4(p[1]) << 16 ) | ( u4(p[2]) << 8 ) | ( u4(p[3]) );
-    lo = ( u4(p[4]) << 24 ) | ( u4(p[5]) << 16 ) | ( u4(p[6]) << 8 ) | ( u4(p[7]) );
+    hi = (u4(p[0]) << 24) |
+         (u4(p[1]) << 16) |
+         (u4(p[2]) <<  8) |
+         (u4(p[3])      );
+    lo = (u4(p[4]) << 24) |
+         (u4(p[5]) << 16) |
+         (u4(p[6]) <<  8) |
+         (u4(p[7])      );
     return u8(lo) | (u8(hi) << 32);
   }
 
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -901,7 +901,7 @@
 }
 
 address CppInterpreter::return_entry(TosState state, int length) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -929,25 +929,25 @@
 address CppInterpreterGenerator::generate_result_handler_for(
     BasicType type) {
   assembler()->advance(1);
-  return ShouldNotReachHereStub();
+  return ShouldNotCallThisStub();
 }
 
 address CppInterpreterGenerator::generate_tosca_to_stack_converter(
     BasicType type) {
   assembler()->advance(1);
-  return ShouldNotReachHereStub();
+  return ShouldNotCallThisStub();
 }
 
 address CppInterpreterGenerator::generate_stack_to_stack_converter(
     BasicType type) {
   assembler()->advance(1);
-  return ShouldNotReachHereStub();
+  return ShouldNotCallThisStub();
 }
 
 address CppInterpreterGenerator::generate_stack_to_native_abi_converter(
     BasicType type) {
   assembler()->advance(1);
-  return ShouldNotReachHereStub();
+  return ShouldNotCallThisStub();
 }
 
 #endif // CC_INTERP
--- a/ports/hotspot/src/cpu/zero/vm/debug_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/debug_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -27,5 +27,5 @@
 #include "incls/_debug_zero.cpp.incl"
 
 void pd_ps(frame f) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -27,9 +27,9 @@
 // with Java specific information.
 
   static int pd_instruction_alignment() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   static const char* pd_cpu_opts() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
--- a/ports/hotspot/src/cpu/zero/vm/dump_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/dump_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -32,5 +32,5 @@
                                                    char*  md_end,
                                                    char** mc_top,
                                                    char*  mc_end) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -28,7 +28,7 @@
 
 #ifdef ASSERT
 void RegisterMap::check_location_valid() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 #endif
 
@@ -81,7 +81,7 @@
   if (is_deoptimizer_frame())
     return sender_for_deoptimizer_frame(map);
 
-  Unimplemented();
+  ShouldNotReachHere();
 }
 
 #ifdef CC_INTERP
@@ -102,14 +102,14 @@
 }
 
 bool frame::safe_for_sender(JavaThread *thread) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void frame::pd_gc_epilog() {
 }
 
 bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 BasicType frame::interpreter_frame_result(oop* oop_result,
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -75,7 +75,7 @@
 }
 
 inline intptr_t* frame::link() const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 #ifdef CC_INTERP
@@ -133,19 +133,19 @@
 }
 
 inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 inline oop frame::saved_oop_result(RegisterMap* map) const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 inline bool frame::is_older(intptr_t* id) const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 inline intptr_t* frame::entry_frame_argument_at(int offset) const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 inline intptr_t* frame::unextended_sp() const {
--- a/ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -35,15 +35,15 @@
                                                 oop cached_oop,
                                                 address entry_point) {
   // NB ic_stub_code_size() must return the size of the code we generate
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
   // NB ic_stub_code_size() must return the size of the code we generate
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
   // NB ic_stub_code_size() must return the size of the code we generate
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/icache_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/icache_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -28,5 +28,5 @@
 
 void ICacheStubGenerator::generate_icache_flush(
   ICache::flush_icache_stub_t* flush_icache_stub) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -40,7 +40,7 @@
 }
 
 address InterpreterGenerator::generate_abstract_entry() {
-  return UnimplementedEntry();
+  return ShouldNotCallThisEntry();
 }
 
 int AbstractInterpreter::size_activation(methodOop method,
--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -41,16 +41,16 @@
 class NativeInstruction VALUE_OBJ_CLASS_SPEC {
  public:
   bool is_jump() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   bool is_safepoint_poll() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
 inline NativeInstruction* nativeInstruction_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 class NativeCall : public NativeInstruction {
@@ -60,82 +60,82 @@
   };
 
   address instruction_address() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   address next_instruction_address() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   address return_address() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   address destination() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void set_destination_mt_safe(address dest) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void verify_alignment() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void verify() {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   static bool is_call_before(address return_address) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
 inline NativeCall* nativeCall_before(address return_address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 inline NativeCall* nativeCall_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 class NativeMovConstReg : public NativeInstruction {
  public:
   address next_instruction_address() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   intptr_t data() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void set_data(intptr_t x) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
 inline NativeMovConstReg* nativeMovConstReg_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 class NativeMovRegMem : public NativeInstruction {
  public:
   int offset() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void set_offset(intptr_t x) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void add_offset_in_bytes(int add_offset) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
 inline NativeMovRegMem* nativeMovRegMem_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 class NativeJump : public NativeInstruction {
@@ -145,11 +145,11 @@
   };
 
   address jump_destination() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   void set_jump_destination(address dest) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   static void check_verified_entry_alignment(address entry,
@@ -162,24 +162,24 @@
 };
 
 inline NativeJump* nativeJump_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 class NativeGeneralJump : public NativeInstruction {
  public:
   address jump_destination() const {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   static void insert_unconditional(address code_pos, address entry) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   static void replace_mt_safe(address instr_addr, address code_buffer) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
 inline NativeGeneralJump* nativeGeneralJump_at(address address) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/register_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/register_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -31,9 +31,9 @@
   ConcreteRegisterImpl::max_gpr + FloatRegisterImpl::number_of_registers;
 
 const char* RegisterImpl::name() const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 const char* FloatRegisterImpl::name() const {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -27,19 +27,19 @@
 #include "incls/_relocInfo_zero.cpp.incl"
 
 void Relocation::pd_set_data_value(address x, intptr_t o) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 address Relocation::pd_call_destination(address orig_addr) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void Relocation::pd_set_call_destination(address x) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 address Relocation::pd_get_address_from_code() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 address* Relocation::pd_address_in_code() {
@@ -48,27 +48,27 @@
 }
 
 int Relocation::pd_breakpoint_size() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void Relocation::pd_swap_in_breakpoint(address x,
                                        short*  instrs,
                                        int     instrlen) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void Relocation::pd_swap_out_breakpoint(address x,
                                         short*  instrs,
                                         int     instrlen) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src,
                                                 CodeBuffer*       dst) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src,
                                                        CodeBuffer*       dst) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -48,10 +48,10 @@
                         int comp_args_on_stack,
                         const BasicType *sig_bt,
                         const VMRegPair *regs) {
-  address i2c_entry = UnimplementedStub();
-  address c2i_entry = UnimplementedStub();
-  address c2i_unverified_entry = UnimplementedStub();
-  return new AdapterHandlerEntry(i2c_entry, c2i_entry, c2i_unverified_entry);
+  return new AdapterHandlerEntry(
+    ShouldNotCallThisStub(),
+    ShouldNotCallThisStub(),
+    ShouldNotCallThisStub());
 }
 
 nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
@@ -61,7 +61,7 @@
                                                 BasicType *in_sig_bt,
                                                 VMRegPair *in_regs,
                                                 BasicType ret_type) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 int Deoptimization::last_frame_adjust(int callee_parameters,
@@ -70,7 +70,7 @@
 }
 
 uint SharedRuntime::out_preserve_stack_slots() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 static RuntimeStub* generate_empty_runtime_stub(const char* name) {
@@ -104,5 +104,5 @@
 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
                                          VMRegPair *regs,
                                          int total_args_passed) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -120,12 +120,12 @@
     StubRoutines::_jlong_disjoint_arraycopy  = (address) fake_arraycopy_stub;
     StubRoutines::_jlong_arraycopy           = (address) fake_arraycopy_stub;
 
-    StubRoutines::_oop_disjoint_arraycopy    = UnimplementedStub();
-    StubRoutines::_oop_arraycopy             = UnimplementedStub();
+    StubRoutines::_oop_disjoint_arraycopy    = ShouldNotCallThisStub();
+    StubRoutines::_oop_arraycopy             = ShouldNotCallThisStub();
 
-    StubRoutines::_checkcast_arraycopy       = UnimplementedStub();
-    StubRoutines::_unsafe_arraycopy          = UnimplementedStub();
-    StubRoutines::_generic_arraycopy         = UnimplementedStub();
+    StubRoutines::_checkcast_arraycopy       = ShouldNotCallThisStub();
+    StubRoutines::_unsafe_arraycopy          = ShouldNotCallThisStub();
+    StubRoutines::_generic_arraycopy         = ShouldNotCallThisStub();
 
     // We don't generate specialized code for HeapWord-aligned source
     // arrays, so just use the code we've already generated
@@ -164,23 +164,23 @@
     // much more complicated generator structure. See also comment in
     // stubRoutines.hpp.
 
-    StubRoutines::_forward_exception_entry   = UnimplementedStub();
+    StubRoutines::_forward_exception_entry   = ShouldNotCallThisStub();
     StubRoutines::_call_stub_entry           = (address) call_stub;
-    StubRoutines::_catch_exception_entry     = UnimplementedStub();
+    StubRoutines::_catch_exception_entry     = ShouldNotCallThisStub();
 
     // atomic calls
-    StubRoutines::_atomic_xchg_entry         = UnimplementedStub();
-    StubRoutines::_atomic_xchg_ptr_entry     = UnimplementedStub();
-    StubRoutines::_atomic_cmpxchg_entry      = UnimplementedStub();
-    StubRoutines::_atomic_cmpxchg_ptr_entry  = UnimplementedStub();
-    StubRoutines::_atomic_cmpxchg_long_entry = UnimplementedStub();
-    StubRoutines::_atomic_add_entry          = UnimplementedStub();
-    StubRoutines::_atomic_add_ptr_entry      = UnimplementedStub();
-    StubRoutines::_fence_entry               = UnimplementedStub();
+    StubRoutines::_atomic_xchg_entry         = ShouldNotCallThisStub();
+    StubRoutines::_atomic_xchg_ptr_entry     = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_entry      = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_ptr_entry  = ShouldNotCallThisStub();
+    StubRoutines::_atomic_cmpxchg_long_entry = ShouldNotCallThisStub();
+    StubRoutines::_atomic_add_entry          = ShouldNotCallThisStub();
+    StubRoutines::_atomic_add_ptr_entry      = ShouldNotCallThisStub();
+    StubRoutines::_fence_entry               = ShouldNotCallThisStub();
 
     // amd64 does this here, sparc does it in generate_all()
     StubRoutines::_handler_for_unsafe_access_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
   }
 
   void generate_all() {
@@ -190,23 +190,23 @@
     // non-core builds and need to be relocatable, so they each
     // fabricate a RuntimeStub internally.
     StubRoutines::_throw_AbstractMethodError_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     StubRoutines::_throw_ArithmeticException_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     StubRoutines::_throw_NullPointerException_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     StubRoutines::_throw_NullPointerException_at_call_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     StubRoutines::_throw_StackOverflowError_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     // support for verify_oop (must happen after universe_init)
     StubRoutines::_verify_oop_subroutine_entry =
-      UnimplementedStub();
+      ShouldNotCallThisStub();
 
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
--- a/ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -27,17 +27,17 @@
 #include "incls/_vtableStubs_zero.cpp.incl"
 
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 VtableStub* VtableStubs::create_itable_stub(int vtable_index) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 int VtableStub::pd_code_alignment() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Wed Sep 16 05:36:53 2009 -0400
@@ -32,7 +32,7 @@
 }
 
 frame os::get_sender_for_C_frame(frame* fr) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 frame os::current_frame() {
@@ -69,17 +69,17 @@
 }
 
 address os::Linux::ucontext_get_pc(ucontext_t* uc) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 ExtendedPC os::fetch_frame_from_context(void* ucVoid,
                                         intptr_t** ret_sp,
                                         intptr_t** ret_fp) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 frame os::fetch_frame_from_context(void* ucVoid) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 #ifdef HOTSPOT_ASM
@@ -149,11 +149,11 @@
         // stack overflow
         if (thread->in_stack_yellow_zone(addr)) {
           thread->disable_stack_yellow_zone();
-          Unimplemented();
+          ShouldNotCallThis();
         }
         else if (thread->in_stack_red_zone(addr)) {
           thread->disable_stack_red_zone();
-          Unimplemented();
+          ShouldNotCallThis();
         }
         else {
           // Accessing stack address below sp may cause SEGV if
@@ -177,11 +177,11 @@
     }
 
     /*if (thread->thread_state() == _thread_in_Java) {
-      Unimplemented();
+      ShouldNotCallThis();
     }
     else*/ if (thread->thread_state() == _thread_in_vm &&
                sig == SIGBUS && thread->doing_unsafe_access()) {
-      Unimplemented();
+      ShouldNotCallThis();
     }
 
     // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC
@@ -241,15 +241,15 @@
 }
 
 int os::Linux::get_fpu_control_word() {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 void os::Linux::set_fpu_control_word(int fpu) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 bool os::is_allocatable(size_t bytes) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -363,7 +363,7 @@
 // helper functions for fatal error handler
 
 void os::print_context(outputStream* st, void* context) {
-  Unimplemented();
+  ShouldNotCallThis();
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -431,22 +431,22 @@
   void _Copy_arrayof_conjoint_bytes(HeapWord* from,
                                     HeapWord* to,
                                     size_t    count) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
   void _Copy_arrayof_conjoint_jshorts(HeapWord* from,
                                       HeapWord* to,
                                       size_t    count) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
   void _Copy_arrayof_conjoint_jints(HeapWord* from,
                                     HeapWord* to,
                                     size_t    count) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
   void _Copy_arrayof_conjoint_jlongs(HeapWord* from,
                                      HeapWord* to,
                                      size_t    count) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 
@@ -460,7 +460,7 @@
     volatile void *ptr,
     long long unsigned int oldval,
     long long unsigned int newval) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 };
 #endif // !_LP64
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp	Tue Sep 15 12:47:59 2009 -0400
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp	Wed Sep 16 05:36:53 2009 -0400
@@ -94,7 +94,7 @@
   bool pd_get_top_frame_for_signal_handler(frame* fr_addr,
                                            void* ucontext,
                                            bool isInJava) {
-    Unimplemented();
+    ShouldNotCallThis();
   }
 
   // These routines are only used on cpu architectures that