The big Zero deletion

[Andrew John Hughes]

Zero was upstreamed a while back, and we backported the beginnings of
it for OpenJDK6 b19.
For b20, the remaining upstream fixes have been synced:
http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-June/001764.html
and b20 should shortly be released.

icedtea6-hg (http://icedtea.classpath.org/hg/icedtea6-hg) is the tree
tracking b20 and I've started work there on removing the upstreamed
Zero.
Overall, 84 files can simply be removed (the only difference being
copyright heads) including a lot of files from ports and zero.patch.

Shark is pretty separate in its own directory and can simply remain.
The ARM port is a little more complicated, as some Zero files have
been altered for this.  These files will be removed as well, and the
changes turned into a patch, so that we don't keep stale versions of
upstream files in IcedTea6.  There also seem to be a few minor
differences that haven't been upstreamed.

The details are as follows:

ports/hotspot/src/share/vm/includeDB_shark
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp
ports/hotspot/src/share/vm/shark/sharkState.hpp
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
ports/hotspot/src/share/vm/shark/sharkValue.hpp
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
ports/hotspot/src/share/vm/shark/sharkState.cpp
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
ports/hotspot/src/share/vm/shark/sharkEntry.hpp
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
ports/hotspot/src/share/vm/shark/sharkValue.cpp
ports/hotspot/src/share/vm/shark/sharkFunction.hpp
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
ports/hotspot/src/share/vm/shark/shark_globals.cpp
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
ports/hotspot/src/share/vm/shark/sharkContext.hpp
ports/hotspot/src/share/vm/shark/sharkConstant.hpp
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
ports/hotspot/src/share/vm/shark/sharkFunction.cpp
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
ports/hotspot/src/share/vm/shark/shark_globals.hpp
ports/hotspot/src/share/vm/shark/sharkConstant.cpp
ports/hotspot/src/share/vm/shark/sharkContext.cpp
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
ports/hotspot/src/share/vm/shark/sharkInliner.hpp
ports/hotspot/src/share/vm/shark/sharkType.hpp
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
ports/hotspot/src/share/vm/shark/sharkInliner.cpp
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
ports/hotspot/src/share/vm/shark/sharkStack.cpp
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp
ports/hotspot/src/share/vm/shark/sharkBlock.cpp
ports/hotspot/src/share/vm/shark/sharkStack.hpp
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
ports/hotspot/src/share/vm/shark/sharkBlock.hpp
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
ports/hotspot/src/share/vm/shark/llvmValue.hpp
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
ports/hotspot/make/./linux/makefiles/shark.make:
Shark only files, remain as is.

ports/hotspot/src/./cpu/zero/vm/cppInterpreter_arm.S
ports/hotspot/src/./cpu/zero/vm/thumb2.cpp
ports/hotspot/src/./cpu/zero/vm/asm_helper.cpp
ports/hotspot/src/./cpu/zero/vm/bytecodes_arm.def:
ARM assembler only files remain as is.

ports/hotspot/src/./cpu/zero/vm/cppInterpreter_zero.cpp
ports/hotspot/src/./cpu/zero/vm/bytecodes_zero.cpp
ports/hotspot/src/./cpu/zero/vm/bytecodes_zero.hpp
ports/hotspot/src/./os_cpu/linux_zero/vm/os_linux_zero.cpp
ports/hotspot/make/./linux/makefiles/zeroshark.make:
All have ARM changes

ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp:

Has the following differences left.

(- is IcedTea6, + is OpenJDK6)

@@ -35,7 +35,6 @@
 define_pd_global(bool,  UncommonNullCast,     true);

 define_pd_global(intx,  CodeEntryAlignment,   32);
-define_pd_global(intx,  OptoLoopAlignment,    16);
 define_pd_global(intx,  InlineFrequencyCount, 100);
 define_pd_global(intx,  PreInflateSpin,       10);

@@ -45,5 +44,3 @@

 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
-
-define_pd_global(intx,  InlineSmallCode,      1000);

plus old Sun copyright.

ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp:

Has the following differences left

+// The disassembler prints out zero code annotated
+// with Java specific information.
+
   static int pd_instruction_alignment() {
-    return 1;
+    ShouldNotCallThis();
   }

   static const char* pd_cpu_opts() {
-    return "";
+    ShouldNotCallThis();

Again with old Sun copyright.

-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8