changeset in /hg/icedtea: 2008-01-29 Gary Benson <gbenson at redh...
Gary Benson
gbenson at redhat.com
Tue Jan 29 02:15:12 PST 2008
changeset 1d3c3b0865e2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d3c3b0865e2
description:
2008-01-29 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: New file.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/copy_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/jni_zero.h: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/register_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp:
Likewise.
* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp:
Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp:
Likewise.
* patches/icedtea-core-build.patch: Change how architecture-specific
conditionals are evaluated to allow for other architectures.
* patches/icedtea-text-relocations.patch: Likewise.
* patches/icedtea-ports.patch: Likewise. Also added conditions for zero.
* patches/icedtea-signature-iterator.patch: Apply changes on zero.
* patches/icedtea-zero.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Add the above.
* Makefile.in: Regenerate.
diffstat:
71 files changed, 6213 insertions(+), 20 deletions(-)
ChangeLog | 111 +
Makefile.am | 1
Makefile.in | 1
patches/icedtea-core-build.patch | 6
patches/icedtea-ports.patch | 34
patches/icedtea-signature-iterator.patch | 6
patches/icedtea-text-relocations.patch | 2
patches/icedtea-zero.patch | 101 +
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 87 +
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 70
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 55
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 155 ++
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 278 +++
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 32
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 25
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 210 ++
ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27
ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 166 ++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 751 ++++++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 37
ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 32
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 44
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 38
ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 37
ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 62
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 118 +
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 51
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 154 ++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 54
ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 52
ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 36
ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 33
ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 31
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 68
ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 37
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 170 ++
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 144 +
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 63
ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 59
ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 78 +
ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp | 159 ++
ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 67
ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 +
ports/hotspot/src/cpu/zero/vm/jni_zero.h | 32
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 222 ++
ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39
ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39
ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 114 +
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 68
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 33
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 116 +
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 169 ++
ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 254 +++
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 41
ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52
ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 32
ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 67
ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29
ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32
ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 47
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 160 ++
ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 43
ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 43
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 101 +
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 368 ++++
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 31
ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 32
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 42
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 32
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 100 +
ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45
diffs (truncated from 6651 to 500 lines):
diff -r 194647c5b89a -r 1d3c3b0865e2 ChangeLog
--- a/ChangeLog Mon Jan 28 09:29:34 2008 -0500
+++ b/ChangeLog Tue Jan 29 05:14:07 2008 -0500
@@ -1,3 +1,114 @@ 2008-01-28 Gary Benson <gbenson at redhat
+2008-01-29 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp: New file.
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/depChecker_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/depChecker_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/globalDefinitions_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/jni_zero.h: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/register_definitions_zero.cpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/register_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/templateInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/templateTable_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/templateTable_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vm_version_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp:
+ Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp:
+ Likewise.
+
+ * patches/icedtea-core-build.patch: Change how architecture-specific
+ conditionals are evaluated to allow for other architectures.
+ * patches/icedtea-text-relocations.patch: Likewise.
+ * patches/icedtea-ports.patch: Likewise. Also added conditions for zero.
+ * patches/icedtea-signature-iterator.patch: Apply changes on zero.
+
+ * patches/icedtea-zero.patch: New file.
+ * Makefile.am (ICEDTEA_PATCHES): Add the above.
+ * Makefile.in: Regenerate.
+
2008-01-28 Gary Benson <gbenson at redhat.com>
* patches/icedtea-lib64.patch: Added other multilib systems.
diff -r 194647c5b89a -r 1d3c3b0865e2 Makefile.am
--- a/Makefile.am Mon Jan 28 09:29:34 2008 -0500
+++ b/Makefile.am Tue Jan 29 05:14:07 2008 -0500
@@ -218,6 +218,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
+ patches/icedtea-zero.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
diff -r 194647c5b89a -r 1d3c3b0865e2 Makefile.in
--- a/Makefile.in Mon Jan 28 09:29:34 2008 -0500
+++ b/Makefile.in Tue Jan 29 05:14:07 2008 -0500
@@ -318,6 +318,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
+ patches/icedtea-zero.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
diff -r 194647c5b89a -r 1d3c3b0865e2 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Mon Jan 28 09:29:34 2008 -0500
+++ b/patches/icedtea-core-build.patch Tue Jan 29 05:14:07 2008 -0500
@@ -6,7 +6,7 @@ diff -ru openjdk.orig/control/make/hotsp
endif
+# Use the special build targets on PPC for now
-+ifneq ($(findstring ppc,$(ARCH)),)
++ifneq ($(filter ppc ppc64,$(ARCH)),)
+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)core
+endif
+
@@ -71,7 +71,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
+# Misc files and generated files need to come from the correct area
-+ifneq ($(findstring ppc,$(ARCH)),)
++ifneq ($(filter ppc ppc64,$(ARCH)),)
+ MISC_DIR=$(CORE_DIR)
+ GEN_DIR=$(CORE_BASE_DIR)/generated
else
@@ -91,7 +91,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
ifneq ($(OSNAME),windows)
$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
$(install-file)
-+ifneq ($(findstring ppc,$(ARCH)),)
++ifneq ($(filter ppc ppc64,$(ARCH)),)
+$(EXPORT_CLIENT_DIR)/%.so: $(CORE_DIR)/%.so
+ $(install-file)
+else
diff -r 194647c5b89a -r 1d3c3b0865e2 patches/icedtea-ports.patch
--- a/patches/icedtea-ports.patch Mon Jan 28 09:29:34 2008 -0500
+++ b/patches/icedtea-ports.patch Tue Jan 29 05:14:07 2008 -0500
@@ -5,7 +5,7 @@ diff -ru openjdk.orig/hotspot/make/Makef
BuildUser=$(USERNAME) \
$(MAKE_ARGS) $(VM_TARGET)
else
-+ ifeq ($(findstring ppc,$(ARCH)),)
++ ifeq ($(filter ppc ppc64,$(ARCH)),)
$(CD) $(OUTPUTDIR); \
$(MAKE) -f $(ABS_OS_MAKEFILE) \
$(MAKE_ARGS) $(VM_TARGET)
@@ -45,7 +45,7 @@ diff -ru openjdk.orig/hotspot/build/linu
+# ppc64
+ifeq ($(ARCH), ppc64)
+ ARCH_DATA_MODEL = 64
-+ MAKE_ARGS += LP64=1
++ MAKE_ARGS += LP64=1
+ PLATFORM = linux-ppc64
+ VM_PLATFORM = linux_ppc64
+ HS_ARCH = ppc
@@ -64,7 +64,7 @@ diff -ru openjdk.orig/hotspot/build/linu
-ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-+ifeq ($(HS_ARCH), ppc)
++ifneq ($(filter ppc zero,$(HS_ARCH)),)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
@@ -101,39 +101,43 @@ diff -ru openjdk.orig/hotspot/build/linu
diff -ru openjdk.orig/hotspot/build/linux/makefiles/sa.make openjdk/hotspot/build/linux/makefiles/sa.make
--- openjdk.orig/hotspot/build/linux/makefiles/sa.make 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/sa.make 2007-11-08 11:36:15.000000000 +0000
-@@ -51,10 +51,10 @@
+@@ -51,10 +51,12 @@
SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
# if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or PPC.
++# also, we don't build SA on Itanium, PPC or zero.
all:
- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
++ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
++ -a "$(SRCARCH)" != "ppc" \
++ -a "$(SRCARCH)" != "zero" ] ; then \
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi
diff -ru openjdk.orig/hotspot/build/linux/makefiles/saproc.make openjdk/hotspot/build/linux/makefiles/saproc.make
--- openjdk.orig/hotspot/build/linux/makefiles/saproc.make 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/build/linux/makefiles/saproc.make 2007-11-08 11:36:15.000000000 +0000
-@@ -44,10 +44,10 @@
+@@ -44,10 +44,12 @@
DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
# if $(AGENT_DIR) does not exist, we don't build SA
-# also, we don't build SA on Itanium.
-+# also, we don't build SA on Itanium or PPC.
++# also, we don't build SA on Itanium, PPC or zero.
checkAndBuildSA:
- $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
-+ $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "ppc" ] ; then \
++ $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
++ -a "$(SRCARCH)" != "ppc" \
++ -a "$(SRCARCH)" != "zero" ] ; then \
$(MAKE) -f vm.make $(LIBSAPROC); \
fi
diff -ru openjdk.orig/hotspot/make/defs.make openjdk/hotspot/make/defs.make
--- openjdk.orig/hotspot/make/defs.make 2007-11-08 11:34:54.000000000 +0000
+++ openjdk/hotspot/make/defs.make 2007-11-08 11:36:15.000000000 +0000
-@@ -191,15 +191,17 @@
+@@ -191,15 +191,18 @@
# Use uname output for SRCARCH, but deal with platform differences. If ARCH
# is not explicitly listed below, it is treated as x86.
@@ -149,11 +153,12 @@ diff -ru openjdk.orig/hotspot/make/defs.
+ ARCH/ppc64 = ppc
- # BUILDARCH is usually the same as SRCARCH, except for sparcv9
-+ # BUILDARCH is usually the same as SRCARCH, except for sparcv9 and ppc64
++ # BUILDARCH is usually the same as SRCARCH, except for sparcv9,
++ # ppc64 and zero
BUILDARCH = $(SRCARCH)
ifeq ($(BUILDARCH), x86)
ifdef LP64
-@@ -213,6 +215,11 @@
+@@ -213,6 +216,14 @@
BUILDARCH = sparcv9
endif
endif
@@ -162,10 +167,13 @@ diff -ru openjdk.orig/hotspot/make/defs.
+ BUILDARCH = ppc64
+ endif
+ endif
++ ifeq ($(BUILDARCH), zero)
++ BUILDARCH = $(ARCH)
++ endif
# LIBARCH is 1:1 mapping from BUILDARCH
LIBARCH = $(LIBARCH/$(BUILDARCH))
-@@ -221,8 +228,10 @@
+@@ -221,8 +232,10 @@
LIBARCH/sparc = sparc
LIBARCH/sparcv9 = sparcv9
LIBARCH/ia64 = ia64
diff -r 194647c5b89a -r 1d3c3b0865e2 patches/icedtea-signature-iterator.patch
--- a/patches/icedtea-signature-iterator.patch Mon Jan 28 09:29:34 2008 -0500
+++ b/patches/icedtea-signature-iterator.patch Tue Jan 29 05:14:07 2008 -0500
@@ -6,7 +6,7 @@ diff -r ee6af95bc459 openjdk/hotspot/src
void pass_int() { /* ignore */ }
void pass_long() { /* ignore */ }
-#ifdef _LP64
-+#if defined(_LP64) || defined(PPC)
++#if defined(_LP64) || defined(PPC) || defined(ZERO)
void pass_float() { /* ignore */ }
#endif
void pass_double() { /* ignore */ }
@@ -17,7 +17,7 @@ diff -r ee6af95bc459 openjdk/hotspot/src
void do_bool () { pass_int(); _jni_offset++; _offset++; }
void do_char () { pass_int(); _jni_offset++; _offset++; }
-+#if defined(_LP64) || defined(PPC)
++#if defined(_LP64) || defined(PPC) || defined(ZERO)
+ void do_float () { pass_float(); _jni_offset++; _offset++; }
+#else
+ void do_float () { pass_int(); _jni_offset++; _offset++; }
@@ -34,7 +34,7 @@ diff -r ee6af95bc459 openjdk/hotspot/src
virtual void pass_int() = 0;
virtual void pass_long() = 0;
virtual void pass_object() = 0;
-+#if defined(_LP64) || defined(PPC)
++#if defined(_LP64) || defined(PPC) || defined(ZERO)
+ virtual void pass_float() = 0;
+#endif
#ifdef _LP64
diff -r 194647c5b89a -r 1d3c3b0865e2 patches/icedtea-text-relocations.patch
--- a/patches/icedtea-text-relocations.patch Mon Jan 28 09:29:34 2008 -0500
+++ b/patches/icedtea-text-relocations.patch Tue Jan 29 05:14:07 2008 -0500
@@ -4,7 +4,7 @@
# Compiler flags
# position-independent code
-+ifeq ($(SRCARCH), ppc)
++ifneq ($(filter ppc ppc64,$(BUILDARCH)),)
PICFLAG = -fPIC
+else
+PICFLAG = -fpic
diff -r 194647c5b89a -r 1d3c3b0865e2 patches/icedtea-zero.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-zero.patch Tue Jan 29 05:14:07 2008 -0500
@@ -0,0 +1,101 @@
+diff -ru openjdk-ecj/hotspot/build/linux/makefiles/vm.make openjdk-ecj.new/hotspot/build/linux/makefiles/vm.make
+--- openjdk/hotspot/build/linux/makefiles/vm.make 2008-01-24 13:17:20.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-01-21 15:18:48.000000000 +0000
+@@ -150,6 +150,9 @@
+
+ LIBS_VM += $(LIBS)
+ endif
++ifeq ($(SRCARCH), zero)
++LIBS_VM += -lffi
++endif
+
+ LINK_VM = $(LINK_LIB.c)
+
+diff -ru openjdk/hotspot/src/share/vm/runtime/icache.cpp openjdk/hotspot/src/share/vm/runtime/icache.cpp
+--- openjdk/hotspot/src/share/vm/runtime/icache.cpp 2007-10-30 08:46:35.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/icache.cpp 2008-01-21 15:18:48.000000000 +0000
+@@ -78,6 +78,7 @@
+ }
+
+ void AbstractICache::invalidate_range(address start, int nbytes) {
++#ifndef ZERO
+ static bool firstTime = true;
+ if (firstTime) {
+ guarantee(start == CAST_FROM_FN_PTR(address, _flush_icache_stub),
+@@ -97,6 +98,7 @@
+ }
+ call_flush_stub(start, round_to(nbytes, ICache::line_size) >>
+ ICache::log2_line_size);
++#endif // ZERO
+ }
+
+ // For init.cpp
+diff -ru openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp
+--- openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp 2007-10-30 08:46:35.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/jniHandles.hpp 2008-01-24 13:26:36.000000000 +0000
+@@ -126,9 +126,17 @@
+ // Fill block with bad_handle values
+ void zap();
+
++#ifdef ZERO
++ protected:
++ friend class CppInterpreter;
++#endif // ZERO
++
+ // No more handles in the both the current and following blocks
+ void clear() { _top = 0; }
+
++#ifdef ZERO
++ private:
++#endif // ZERO
+ // Free list computation
+ void rebuild_free_list();
+
+diff -ru openjdk/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
+--- openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-01-24 13:17:27.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-01-24 13:21:20.000000000 +0000
+@@ -24,6 +24,11 @@
+
+ # include "incls/_precompiled.incl"
+ # include "incls/_vmError.cpp.incl"
++
++# ifdef ZERO
++# include <interpreterRuntime.hpp>
++# include <stackPrinter_zero.hpp>
++# endif //
+
+ // List of environment variables that should be reported in error log file.
+ const char *env_list[] = {
+@@ -392,6 +397,7 @@
+ st->cr();
+ }
+
++#ifndef ZERO
+ STEP(110, "(printing stack bounds)" )
+
+ if (_verbose) {
+@@ -449,11 +455,16 @@
+ st->cr();
+ }
+ }
++#endif // !ZERO
+
+ STEP(130, "(printing Java stack)" )
+
+ if (_verbose && _thread && _thread->is_Java_thread()) {
+ JavaThread* jt = (JavaThread*)_thread;
++#ifdef ZERO
++ st->print_cr("Java stack:");
++ JavaStackPrinter(st, buf, sizeof(buf)).print(jt);
++#else
+ if (jt->has_last_Java_frame()) {
+ st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
+ for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
+@@ -461,6 +472,7 @@
+ st->cr();
+ }
+ }
++#endif // ZERO
+ }
+
+ STEP(140, "(printing VM operation)" )
diff -r 194647c5b89a -r 1d3c3b0865e2 ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp Tue Jan 29 05:14:07 2008 -0500
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007, 2008 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_assembler_zero.cpp.incl"
+
+int AbstractAssembler::code_fill_byte()
+{
+ Unimplemented();
+}
+
+void Assembler::pd_patch_instruction(address branch, address target)
+{
+ Unimplemented();
+}
+
+#ifndef PRODUCT
+void Assembler::pd_print_patched_instruction(address branch)
+{
+ Unimplemented();
+}
+#endif // PRODUCT
+
+void MacroAssembler::bang_stack_with_offset(int offset)
+{
+ Unimplemented();
+}
+
+void MacroAssembler::align(int modulus)
+{
+ // Loads of places assert that code is generated,
+ // and I'm guessing plenty of places assume that
+ // *something* was generated. This is a sneaky
+ // place to emit such a something.
+ emit_byte(0x23);
+
+ // Probably ought to align it too, while we're here.
+ while (offset() % modulus != 0)
+ emit_byte(0x23);
+}
+
+static void _UnimplementedStub()
+{
+ report_unimplemented("fake-generated-code", 23);
+}
+
More information about the distro-pkg-dev
mailing list