--- a/ChangeLog	Fri Sep 04 05:43:23 2009 -0400
+++ b/ChangeLog	Fri Sep 04 07:14:31 2009 -0400
@@ -1,3 +1,35 @@
+2009-09-04  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
+	(ZeroEntry::method_entry_t): Renamed as...
+	(ZeroEntry::NormalEntryFunc): New type.
+	(ZeroEntry::osr_entry_t): Renamed as...
+	(ZeroEntry::OSREntryFunc): New type.
+	(ZeroEntry::_entry_point): Changed type.
+	(ZeroEntry::entry_point): Changed signature.
+	(ZeroEntry::set_entry_point): Likewise.
+	(ZeroEntry::invoke): Added cast.
+	(ZeroEntry::invoke_osr): Updated cast.
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp
+	(CppInterpreter::generate_entry): Changed signature.
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(InterpreterGenerator::generate_normal_entry): Added cast.
+	(InterpreterGenerator::generate_native_entry): Likewise.
+	(InterpreterGenerator::generate_accessor_entry): Likewise.
+	(InterpreterGenerator::generate_empty_entry): Likewise.
+	(AbstractInterpreterGenerator::generate_method_entry): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::compile_method): Updated cast.
+
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+	(SharkEntry::code_start): Removed cast.
+
+	* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
+	(NativeJump::patch_verified_entry): Added cast.
+
 2009-09-04  Gary Benson  <gbenson@redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp

--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp	Fri Sep 04 07:14:31 2009 -0400
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 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
@@ -29,7 +29,7 @@
   }
 
  protected:
-  address generate_entry(ZeroEntry::method_entry_t entry_point) {
+  address generate_entry(address entry_point) {
     ZeroEntry *entry = (ZeroEntry *) assembler()->pc();
     assembler()->advance(sizeof(ZeroEntry));
     entry->set_entry_point(entry_point);

--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Sep 04 07:14:31 2009 -0400
@@ -697,26 +697,26 @@
   if (!UseFastEmptyMethods)
     return NULL;
 
-  return generate_entry(CppInterpreter::empty_entry);
+  return generate_entry((address) CppInterpreter::empty_entry);
 }
 
 address InterpreterGenerator::generate_accessor_entry() {
   if (!UseFastAccessorMethods)
     return NULL;
 
-  return generate_entry(CppInterpreter::accessor_entry);
+  return generate_entry((address) CppInterpreter::accessor_entry);
 }
 
 address InterpreterGenerator::generate_native_entry(bool synchronized) {
-  assert (synchronized == false, "should be");
+  assert(synchronized == false, "should be");
 
-  return generate_entry(CppInterpreter::native_entry);
+  return generate_entry((address) CppInterpreter::native_entry);
 }
 
 address InterpreterGenerator::generate_normal_entry(bool synchronized) {
-  assert (synchronized == false, "should be");
+  assert(synchronized == false, "should be");
 
-  return generate_entry(CppInterpreter::normal_entry);
+  return generate_entry((address) CppInterpreter::normal_entry);
 }
 
 #if defined(PRODUCT) && defined(HOTSPOT_ASM)
@@ -727,16 +727,15 @@
 
 address AbstractInterpreterGenerator::generate_method_entry(
     AbstractInterpreter::MethodKind kind) {
-
   address entry_point = NULL;
 
 #if defined(PRODUCT) && defined(HOTSPOT_ASM)
   if (!UseCompiler && !TaggedStackInterpreter &&
       !JvmtiExport::can_post_interpreter_events() &&
       !PrintCommandLineFlags) {
-    BCI_ENTRY asm_entry = asm_generate_method_entry(kind);
+    address asm_entry = (address) asm_generate_method_entry(kind);
     if (asm_entry)
-      return ((InterpreterGenerator*)this)->generate_entry(asm_entry);
+      return ((InterpreterGenerator*) this)->generate_entry(asm_entry);
   }
 #endif // HOTSPOT_ASM
 
@@ -746,23 +745,23 @@
     break;
 
   case Interpreter::native:
-    entry_point = ((InterpreterGenerator*)this)->generate_native_entry(false);
+    entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
     break;
 
   case Interpreter::native_synchronized:
-    entry_point = ((InterpreterGenerator*)this)->generate_native_entry(false);
+    entry_point = ((InterpreterGenerator*) this)->generate_native_entry(false);
     break;
 
   case Interpreter::empty:
-    entry_point = ((InterpreterGenerator*)this)->generate_empty_entry();
+    entry_point = ((InterpreterGenerator*) this)->generate_empty_entry();
     break;
 
   case Interpreter::accessor:
-    entry_point = ((InterpreterGenerator*)this)->generate_accessor_entry();
+    entry_point = ((InterpreterGenerator*) this)->generate_accessor_entry();
     break;
 
   case Interpreter::abstract:
-    entry_point = ((InterpreterGenerator*)this)->generate_abstract_entry();
+    entry_point = ((InterpreterGenerator*) this)->generate_abstract_entry();
     break;
 
   case Interpreter::java_lang_math_sin:
@@ -772,7 +771,7 @@
   case Interpreter::java_lang_math_log:
   case Interpreter::java_lang_math_log10:
   case Interpreter::java_lang_math_sqrt:
-    entry_point = ((InterpreterGenerator*)this)->generate_math_entry(kind);
+    entry_point = ((InterpreterGenerator*) this)->generate_math_entry(kind);
     break;
 
   default:
@@ -780,7 +779,7 @@
   }
 
   if (entry_point == NULL)
-    entry_point = ((InterpreterGenerator*)this)->generate_normal_entry(false);
+    entry_point = ((InterpreterGenerator*) this)->generate_normal_entry(false);
 
   return entry_point;
 }

--- a/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Fri Sep 04 07:14:31 2009 -0400
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 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
@@ -29,30 +29,32 @@
     ShouldNotCallThis();
   }
 
- public:
-  typedef void (*method_entry_t)(methodOop method, intptr_t base_pc, TRAPS);
-  typedef void (*osr_entry_t)(methodOop method,
-                              address   osr_buf,
-                              intptr_t  base_pc,
-                              TRAPS);
-
  private:
-  method_entry_t _entry_point;
+  address _entry_point;
 
  public:
-  method_entry_t entry_point() const {
+  address entry_point() const {
     return _entry_point;
   }
-  void set_entry_point(method_entry_t entry_point) {
+  void set_entry_point(address entry_point) {
     _entry_point = entry_point;
   }
 
+ private:
+  typedef void (*NormalEntryFunc)(methodOop method,
+                                  intptr_t  base_pc,
+                                  TRAPS);
+  typedef void (*OSREntryFunc)(methodOop method,
+                               address   osr_buf,
+                               intptr_t  base_pc,
+                               TRAPS);
+
  public:
   void invoke(methodOop method, TRAPS) const {
-    entry_point()(method, (intptr_t) this, THREAD);
+    ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
   }
   void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
-    ((osr_entry_t) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
+    ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
   }
 
  public:

--- a/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp	Fri Sep 04 07:14:31 2009 -0400
@@ -42,7 +42,8 @@
   assert(dest == SharedRuntime::get_handle_wrong_method_stub(), "should be");
 
 #ifdef CC_INTERP
-  ((ZeroEntry*) verified_entry)->set_entry_point(CppInterpreter::normal_entry);
+  ((ZeroEntry*) verified_entry)->set_entry_point(
+    (address) CppInterpreter::normal_entry);
 #else
   Unimplemented();
 #endif // CC_INTERP  

--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Sep 04 07:14:31 2009 -0400
@@ -169,8 +169,7 @@
   memory_manager()->set_entry_for_function(function, entry);
   module()->getFunctionList().push_back(function);
   entry->set_entry_point(
-    (ZeroEntry::method_entry_t)
-      execution_engine()->getPointerToFunction(function));
+    (address) execution_engine()->getPointerToFunction(function));
   address code_start = entry->code_start();
   address code_limit = entry->code_limit();
 

--- a/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Fri Sep 04 05:43:23 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Fri Sep 04 07:14:31 2009 -0400
@@ -31,7 +31,7 @@
  public:
   address code_start() const
   {
-    return (address) entry_point();
+    return entry_point();
   }
   address code_limit() const
   {