changeset 1466:e7eec12f4f71

Support Zero on IcedTea6+hs14.0b08 2008-12-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/icedtea-bytecodeInterpreter.patch, * patches/icedtea-hotspot7-build-fixes.patch: Removed. * Makefile.am: Sort out Zero patches. * patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch, * patches/icedtea-hotspot-14.0b08-gcc-4.3.patch, * patches/icedtea-hotspot-original-bytecodeInterpreter.patch: New HotSpot specific patches. * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp, * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp, * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp, * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp, * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Updated using IcedTea7 versions for 14.0b08.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 02 Dec 2008 17:04:02 +0000
parents 77c54978bab7
children 88c610e6f50a
files ChangeLog Makefile.am patches/icedtea-bytecodeInterpreter.patch patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch patches/icedtea-hotspot-14.0b08-gcc-4.3.patch patches/icedtea-hotspot-original-bytecodeInterpreter.patch patches/icedtea-hotspot7-build-fixes.patch ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp ports/hotspot/src/cpu/zero/vm/frame_zero.cpp ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
diffstat 13 files changed, 153 insertions(+), 129 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 01 17:30:31 2008 +0000
+++ b/ChangeLog	Tue Dec 02 17:04:02 2008 +0000
@@ -1,3 +1,22 @@
+2008-12-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* patches/icedtea-bytecodeInterpreter.patch,
+	* patches/icedtea-hotspot7-build-fixes.patch:
+	Removed.
+	* Makefile.am:
+	Sort out Zero patches.
+	* patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch,
+	* patches/icedtea-hotspot-14.0b08-gcc-4.3.patch,
+	* patches/icedtea-hotspot-original-bytecodeInterpreter.patch:
+	New HotSpot specific patches.
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp,
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp:
+	Updated using IcedTea7 versions for 14.0b08.
+
 2008-12-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* patches/icedtea-hotspot-params-cast-size_t.patch,
--- a/Makefile.am	Mon Dec 01 17:30:31 2008 +0000
+++ b/Makefile.am	Tue Dec 02 17:04:02 2008 +0000
@@ -427,11 +427,11 @@
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/$(HOTSPOT_MAKE_DIR)/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
-	  ln -sf $$target $$link; \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
+	  ln -sfv $$target $$link; \
 	done
 	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
@@ -458,16 +458,19 @@
 # If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
 ZERO_PATCHES = \
-	patches/icedtea-hotspot-6b12-7b24.patch \
-	patches/icedtea-hotspot7-build-fixes.patch \
-	patches/icedtea-bytecodeInterpreter.patch \
-	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-hotspot-$(HSBUILD)-bytecodeInterpreter.patch \
 	patches/icedtea-signature-iterator.patch \
-	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-ia64-bugfix.patch 
+
+if !WITH_ALT_HSBUILD
+ZERO_PATCHES += \
+	patches/icedtea-hotspot-6b12-7b24.patch \
+	patches/icedtea-bytecodeInterpreterWithChecks.patch \
+	patches/icedtea-signed-types.patch \
 	patches/icedtea-hotspot-citypeflow.patch
+endif
 
 # Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
 NON_ZERO_PATCHES = \
@@ -802,11 +805,11 @@
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/$(HOTSPOT_MAKE_DIR)/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
-	  ln -sf $$target $$link; \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
+	  ln -sfv $$target $$link; \
 	done
 	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/$(HOTSPOT_MAKE_DIR)/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
--- a/patches/icedtea-bytecodeInterpreter.patch	Mon Dec 01 17:30:31 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:14:32 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:15:45 2007 +0000
-@@ -60,7 +60,6 @@
- };
- 
- class BytecodeInterpreter : StackObj {
--friend class SharedRuntime;
- friend class AbstractInterpreterGenerator;
- friend class CppInterpreterGenerator;
- friend class InterpreterGenerator;
-diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:08:47 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:21:08 2007 +0000
-@@ -518,16 +518,16 @@
- 
- /* 0xC0 */ &&opc_checkcast,   &&opc_instanceof,     &&opc_monitorenter, &&opc_monitorexit,
- /* 0xC4 */ &&opc_wide,        &&opc_multianewarray, &&opc_ifnull,       &&opc_ifnonnull,
--/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_fast_igetfield,
--/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0,  &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
--
--/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer,      &&opc_default,
-+/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_default,
-+/* 0xCC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
-+
-+/* 0xD0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xD4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xD8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- 
- /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
--/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
-+/* 0xE4 */ &&opc_default,     &&opc_return_register_finalizer, &&opc_default, &&opc_default,
- /* 0xE8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot-14.0b08-bytecodeInterpreter.patch	Tue Dec 02 17:04:02 2008 +0000
@@ -0,0 +1,11 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-23 08:41:04.000000000 +0100
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-30 15:48:48.000000000 +0000
+@@ -60,7 +60,6 @@
+ };
+ 
+ class BytecodeInterpreter : StackObj {
+-friend class SharedRuntime;
+ friend class AbstractInterpreterGenerator;
+ friend class CppInterpreterGenerator;
+ friend class InterpreterGenerator;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot-14.0b08-gcc-4.3.patch	Tue Dec 02 17:04:02 2008 +0000
@@ -0,0 +1,54 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2008-12-01 12:06:51.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2008-12-01 12:27:08.000000000 +0000
+@@ -98,7 +98,7 @@
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++# WARNINGS_ARE_ERRORS = -Werror
+ 
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make	2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make	2008-12-01 12:25:10.000000000 +0000
+@@ -109,7 +109,8 @@
+ 
+ 
+ # Compiler warnings are treated as errors 
+-WARNINGS_ARE_ERRORS = -Werror 
++# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
++# WARNINGS_ARE_ERRORS = -Werror 
+ # Enable these warnings. See 'info gcc' about details on these options
+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
+diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
+--- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp	2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp	2008-12-01 12:25:10.000000000 +0000
+@@ -25,6 +25,8 @@
+ // FILEBUFF.CPP - Routines for handling a parser file buffer
+ #include "adlc.hpp"
+ 
++using namespace std;
++
+ //------------------------------FileBuff---------------------------------------
+ // Create a new parsing buffer
+ FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
+diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
+--- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp	2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp	2008-12-01 12:25:10.000000000 +0000
+@@ -94,8 +94,11 @@
+   FileBuffRegion *copy();                   // Deep copy
+   FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
+ 
+-//  void print(std::ostream&);
+-//  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
++#if defined(__GNUC__) && __GNUC__ >= 3
++  void print(std::ostream&);
++  friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
++#else
+   void print(ostream&);
+   friend ostream& operator<< (ostream&, FileBuffRegion&);
++#endif
+ };
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-hotspot-original-bytecodeInterpreter.patch	Tue Dec 02 17:04:02 2008 +0000
@@ -0,0 +1,36 @@
+diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:14:32 2007 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:15:45 2007 +0000
+@@ -60,7 +60,6 @@
+ };
+ 
+ class BytecodeInterpreter : StackObj {
+-friend class SharedRuntime;
+ friend class AbstractInterpreterGenerator;
+ friend class CppInterpreterGenerator;
+ friend class InterpreterGenerator;
+diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:08:47 2007 +0000
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:21:08 2007 +0000
+@@ -518,16 +518,16 @@
+ 
+ /* 0xC0 */ &&opc_checkcast,   &&opc_instanceof,     &&opc_monitorenter, &&opc_monitorexit,
+ /* 0xC4 */ &&opc_wide,        &&opc_multianewarray, &&opc_ifnull,       &&opc_ifnonnull,
+-/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_fast_igetfield,
+-/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0,  &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
+-
+-/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer,      &&opc_default,
++/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_default,
++/* 0xCC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
++
++/* 0xD0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xD4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xD8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
+ /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+-/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
++/* 0xE4 */ &&opc_default,     &&opc_return_register_finalizer, &&opc_default, &&opc_default,
+ /* 0xE8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
--- a/patches/icedtea-hotspot7-build-fixes.patch	Mon Dec 01 17:30:31 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-diff -r 2323cafebabe openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-01-31 09:19:01.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-29 13:12:39.000000000 -0500
-@@ -86,16 +86,12 @@
-   #define VMLP ""
- #endif
- 
--#ifdef KERNEL
--  #define VMTYPE "Kernel"
--#else // KERNEL
- #ifdef TIERED
-   #define VMTYPE "Server"
- #else
-   #define VMTYPE COMPILER1_PRESENT("Client")   \
-                  COMPILER2_PRESENT("Server")
- #endif // TIERED
--#endif // KERNEL
- 
- #ifndef HOTSPOT_VM_DISTRO
-   #error HOTSPOT_VM_DISTRO must be defined
-diff -r 848a72e3bc9b openjdk/hotspot/build/linux/makefiles/top.make
---- openjdk/hotspot/build/linux/makefiles/top.make	Fri Feb 29 17:02:22 2008 +0000
-+++ openjdk/hotspot/build/linux/makefiles/top.make	Fri Feb 29 17:04:07 2008 +0000
-@@ -67,7 +67,9 @@ Include_DBs/GC          = $(VM)/includeD
-                           $(VM)/gc_implementation/includeDB_gc_serial \
-                           $(VM)/gc_implementation/includeDB_gc_shared
- 
--Include_DBs/CORE        = $(VM)/includeDB_core   $(Include_DBs/GC)
-+Include_DBs/CORE        = $(VM)/includeDB_core   $(Include_DBs/GC) \
-+                          $(VM)/includeDB_jvmti \
-+                          $(VM)/includeDB_features
- Include_DBs/COMPILER1   = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
- Include_DBs/COMPILER2   = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
- Include_DBs/TIERED      = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
-diff -r 2323cafebabe openjdk/hotspot/build/linux/makefiles/jvmti.make
---- openjdk/hotspot/build/linux/makefiles/jvmti.make	2008-02-29 16:50:25.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/jvmti.make	2008-02-29 10:21:43.000000000 +0000
-@@ -36,6 +36,7 @@
- JvmtiOutDir = $(GENERATED)/jvmtifiles
- 
- JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims
-+InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter
- Src_Dirs += $(JvmtiSrcDir)
- 
- # set VPATH so make knows where to look for source files
-@@ -47,6 +48,7 @@
-         jvmtiEnter.cpp \
-         jvmtiEnterTrace.cpp \
-         jvmtiEnvRecommended.cpp\
-+        bytecodeInterpreterWithChecks.cpp \
-         jvmti.h \
- 
- JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java
-@@ -77,6 +79,10 @@
- 	@echo Generating $@
- 	$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
- 
-+$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
-+	@echo Generating $@
-+	$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp 
-+
- $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
- 	@echo Generating $@
- 	$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Tue Dec 02 17:04:02 2008 +0000
@@ -44,7 +44,7 @@
 
   void align(int modulus);
   void bang_stack_with_offset(int offset);
-
+  bool needs_explicit_null_check(intptr_t offset);
  public:
   void advance(int bytes);
 };
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp	Tue Dec 02 17:04:02 2008 +0000
@@ -47,3 +47,4 @@
   Unimplemented();
 }
 #endif // PRODUCT
+
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Tue Dec 02 17:04:02 2008 +0000
@@ -26,13 +26,10 @@
 // The disassembler prints out zero code annotated
 // with Java specific information.
 
-class Disassembler
-{
- public:
-  static void decode(CodeBlob *cb, outputStream *st = NULL)
-    PRODUCT_RETURN;
-  static void decode(nmethod *nm, outputStream *st = NULL)
-    PRODUCT_RETURN;
-  static void decode(u_char *begin, u_char *end, outputStream *st = NULL)
-    PRODUCT_RETURN;
-};
+  static int pd_instruction_alignment() {
+    Unimplemented();
+  }
+
+  static const char* pd_cpu_opts() {
+    Unimplemented();
+  }
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Tue Dec 02 17:04:02 2008 +0000
@@ -125,7 +125,7 @@
 {
 }
 
-bool frame::is_interpreted_frame_valid() const
+bool frame::is_interpreted_frame_valid(JavaThread *thread) const
 {
   Unimplemented();
 }
--- a/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Tue Dec 02 17:04:02 2008 +0000
@@ -66,3 +66,11 @@
 {
   Unimplemented();
 }
+
+void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer *dest) {
+  Unimplemented();
+}
+
+void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
+  Unimplemented();
+}
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Mon Dec 01 17:30:31 2008 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Dec 02 17:04:02 2008 +0000
@@ -78,11 +78,6 @@
   Unimplemented();
 }
 
-julong os::allocatable_physical_memory(julong size)
-{
-  Unimplemented();
-}
-
 extern "C" int
 JVM_handle_linux_signal(int sig,
                         siginfo_t* info,