changeset in /hg/icedtea6: 2009-08-20 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Thu Aug 20 02:29:17 PDT 2009
changeset 6d3eba5c3458 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6d3eba5c3458
description:
2009-08-20 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/bc.def: Renamed to...
* ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def: New file.
* Makefile.am: Build bytecodes_arm.s from bytecodes_arm.def.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Include
bytecodes_arm.s rather than bytecodes.s.
* ports/hotspot/src/cpu/zero/vm/bytecodes.s: Removed.
* .hgignore: Updated.
diffstat:
7 files changed, 7895 insertions(+), 20665 deletions(-)
.hgignore | 1
ChangeLog | 16
Makefile.am | 18
ports/hotspot/src/cpu/zero/vm/bc.def | 7863 ------------
ports/hotspot/src/cpu/zero/vm/bytecodes.s |12797 --------------------
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 7863 ++++++++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2
diffs (truncated from 28634 to 500 lines):
diff -r ef80530c169e -r 6d3eba5c3458 .hgignore
--- a/.hgignore Tue Aug 18 10:01:52 2009 +0100
+++ b/.hgignore Thu Aug 20 05:24:04 2009 -0400
@@ -469,3 +469,4 @@ pulseaudio/.*jar
pulseaudio/.*jar
pulse-java.jar
hotspot.tar.gz
+ports/hotspot/src/cpu/zero/vm/bytecodes_arm.s
diff -r ef80530c169e -r 6d3eba5c3458 ChangeLog
--- a/ChangeLog Tue Aug 18 10:01:52 2009 +0100
+++ b/ChangeLog Thu Aug 20 05:24:04 2009 -0400
@@ -1,3 +1,17 @@ 2009-08-18 Edward Nevill <ed at camswl.com
+2009-08-20 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/bc.def: Renamed to...
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def: New file.
+
+ * Makefile.am: Build bytecodes_arm.s from bytecodes_arm.def.
+
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: Include
+ bytecodes_arm.s rather than bytecodes.s.
+
+ * ports/hotspot/src/cpu/zero/vm/bytecodes.s: Removed.
+
+ * .hgignore: Updated.
+
2009-08-18 Edward Nevill <ed at camswl.com>
Added ARM assembler interpreter
@@ -33,7 +47,7 @@ 2009-08-18 Edward Nevill <ed at camswl.com
* ports/hotspot/src/cpu/zero/vm/mkbc.c
Bytecode generator, use to generate bytecodes.s from bc.def
-2009-08-14 Deepak Bhole <dbhole at redhat.com>
+2009-08-14 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
(newMessageOnBus): Handle additional request types.
diff -r ef80530c169e -r 6d3eba5c3458 Makefile.am
--- a/Makefile.am Tue Aug 18 10:01:52 2009 +0100
+++ b/Makefile.am Thu Aug 20 05:24:04 2009 -0400
@@ -456,6 +456,17 @@ if WITH_VISUALVM
rm -f $(VISUALVM_SRC_ZIP)
rm -f $(NETBEANS_PROFILER_SRC_ZIP)
endif
+
+# Build asm interpreter bytecodes
+ZERO_ASM_BC_DEF = $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/bytecodes_$(ZERO_LIBARCH).def
+ZERO_ASM_BC_ASM = $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/bytecodes_$(ZERO_LIBARCH).s
+ZERO_ASM_BC_ASM_COND = $(shell test -f ${ZERO_ASM_BC_DEF} && echo ${ZERO_ASM_BC_ASM})
+
+$(abs_top_srcdir)/mkbc: $(abs_top_srcdir)/mkbc.c
+ $(CC) $< -o $@
+
+${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
+ $(abs_top_srcdir)/mkbc $< $@
# Link ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
@@ -1122,7 +1133,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1207,7 +1218,7 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
- stamps/pulse-java.stamp
+ stamps/pulse-java.stamp $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk \
@@ -1319,7 +1330,8 @@ stamps/native-ecj.stamp:
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
+ stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+ $(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
diff -r ef80530c169e -r 6d3eba5c3458 ports/hotspot/src/cpu/zero/vm/bc.def
--- a/ports/hotspot/src/cpu/zero/vm/bc.def Tue Aug 18 10:01:52 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7863 +0,0 @@
-nop = 0x00, 1
-aconst_null = 0x01, 1
-iconst_m1 = 0x02, 1
-iconst_0 = 0x03, 1
-iconst_1 = 0x04, 1
-iconst_2 = 0x05, 1
-iconst_3 = 0x06, 1
-iconst_4 = 0x07, 1
-iconst_5 = 0x08, 1
-lconst_0 = 0x09, 1
-lconst_1 = 0x0a, 1
-fconst_0 = 0x0b, 1
-fconst_1 = 0x0c, 1
-fconst_2 = 0x0d, 1
-dconst_0 = 0x0e, 1
-dconst_1 = 0x0f, 1
-bipush = 0x10, 2
-sipush = 0x11, 3
-ldc = 0x12, 2
-ldc_w = 0x13, 3
-ldc2_w = 0x14, 3
-iload = 0x15, 2
-lload = 0x16, 2
-fload = 0x17, 2
-dload = 0x18, 2
-aload = 0x19, 2
-iload_0 = 0x1a, 1
-iload_1 = 0x1b, 1
-iload_2 = 0x1c, 1
-iload_3 = 0x1d, 1
-lload_0 = 0x1e, 1
-lload_1 = 0x1f, 1
-lload_2 = 0x20, 1
-lload_3 = 0x21, 1
-fload_0 = 0x22, 1
-fload_1 = 0x23, 1
-fload_2 = 0x24, 1
-fload_3 = 0x25, 1
-dload_0 = 0x26, 1
-dload_1 = 0x27, 1
-dload_2 = 0x28, 1
-dload_3 = 0x29, 1
-aload_0 = 0x2a, 1
-aload_1 = 0x2b, 1
-aload_2 = 0x2c, 1
-aload_3 = 0x2d, 1
-iaload = 0x2e, 1
-laload = 0x2f, 1
-faload = 0x30, 1
-daload = 0x31, 1
-aaload = 0x32, 1
-baload = 0x33, 1
-caload = 0x34, 1
-saload = 0x35, 1
-istore = 0x36, 2
-lstore = 0x37, 2
-fstore = 0x38, 2
-dstore = 0x39, 2
-astore = 0x3a, 2
-istore_0 = 0x3b, 1
-istore_1 = 0x3c, 1
-istore_2 = 0x3d, 1
-istore_3 = 0x3e, 1
-lstore_0 = 0x3f, 1
-lstore_1 = 0x40, 1
-lstore_2 = 0x41, 1
-lstore_3 = 0x42, 1
-fstore_0 = 0x43, 1
-fstore_1 = 0x44, 1
-fstore_2 = 0x45, 1
-fstore_3 = 0x46, 1
-dstore_0 = 0x47, 1
-dstore_1 = 0x48, 1
-dstore_2 = 0x49, 1
-dstore_3 = 0x4a, 1
-astore_0 = 0x4b, 1
-astore_1 = 0x4c, 1
-astore_2 = 0x4d, 1
-astore_3 = 0x4e, 1
-iastore = 0x4f, 1
-lastore = 0x50, 1
-fastore = 0x51, 1
-dastore = 0x52, 1
-aastore = 0x53, 1
-bastore = 0x54, 1
-castore = 0x55, 1
-sastore = 0x56, 1
-pop = 0x57, 1
-pop2 = 0x58, 1
-dup = 0x59, 1
-dup_x1 = 0x5a, 1
-dup_x2 = 0x5b, 1
-dup2 = 0x5c, 1
-dup2_x1 = 0x5d, 1
-dup2_x2 = 0x5e, 1
-swap = 0x5f, 1
-iadd = 0x60, 1
-ladd = 0x61, 1
-fadd = 0x62, 1
-dadd = 0x63, 1
-isub = 0x64, 1
-lsub = 0x65, 1
-fsub = 0x66, 1
-dsub = 0x67, 1
-imul = 0x68, 1
-lmul = 0x69, 1
-fmul = 0x6a, 1
-dmul = 0x6b, 1
-idiv = 0x6c, 1
-ldiv = 0x6d, 1
-fdiv = 0x6e, 1
-ddiv = 0x6f, 1
-irem = 0x70, 1
-lrem = 0x71, 1
-frem = 0x72, 1
-drem = 0x73, 1
-ineg = 0x74, 1
-lneg = 0x75, 1
-fneg = 0x76, 1
-dneg = 0x77, 1
-ishl = 0x78, 1
-lshl = 0x79, 1
-ishr = 0x7a, 1
-lshr = 0x7b, 1
-iushr = 0x7c, 1
-lushr = 0x7d, 1
-iand = 0x7e, 1
-land = 0x7f, 1
-ior = 0x80, 1
-lor = 0x81, 1
-ixor = 0x82, 1
-lxor = 0x83, 1
-iinc = 0x84, 3
-i2l = 0x85, 1
-i2f = 0x86, 1
-i2d = 0x87, 1
-l2i = 0x88, 1
-l2f = 0x89, 1
-l2d = 0x8a, 1
-f2i = 0x8b, 1
-f2l = 0x8c, 1
-f2d = 0x8d, 1
-d2i = 0x8e, 1
-d2l = 0x8f, 1
-d2f = 0x90, 1
-i2b = 0x91, 1
-i2c = 0x92, 1
-i2s = 0x93, 1
-lcmp = 0x94, 1
-fcmpl = 0x95, 1
-fcmpg = 0x96, 1
-dcmpl = 0x97, 1
-dcmpg = 0x98, 1
-ifeq = 0x99, 0
-ifne = 0x9a, 0
-iflt = 0x9b, 0
-ifge = 0x9c, 0
-ifgt = 0x9d, 0
-ifle = 0x9e, 0
-if_icmpeq = 0x9f, 0
-if_icmpne = 0xa0, 0
-if_icmplt = 0xa1, 0
-if_icmpge = 0xa2, 0
-if_icmpgt = 0xa3, 0
-if_icmple = 0xa4, 0
-if_acmpeq = 0xa5, 0
-if_acmpne = 0xa6, 0
-goto = 0xa7, 0
-jsr = 0xa8, 0
-ret = 0xa9, 0
-tableswitch = 0xaa, 0
-lookupswitch = 0xab, 0
-ireturn = 0xac, 0
-lreturn = 0xad, 0
-freturn = 0xae, 0
-dreturn = 0xaf, 0
-areturn = 0xb0, 0
-return = 0xb1, 0
-getstatic = 0xb2, 3
-putstatic = 0xb3, 3
-getfield = 0xb4, 3
-putfield = 0xb5, 3
-invokevirtual = 0xb6, 3
-invokespecial = 0xb7, 3
-invokestatic = 0xb8, 3
-invokeinterface = 0xb9, 0
-new = 0xbb, 3
-newarray = 0xbc, 2
-anewarray = 0xbd, 3
-arraylength = 0xbe, 1
-athrow = 0xbf, 0
-checkcast = 0xc0, 3
-instanceof = 0xc1, 3
-monitorenter = 0xc2, 1
-monitorexit = 0xc3, 1
-wide = 0xc4, 1
-multianewarray = 0xc5, 4
-ifnull = 0xc6, 0
-ifnonnull = 0xc7, 0
-goto_w = 0xc8, 0
-jsr_w = 0xc9, 0
-breakpoint = 0xca, 0
-
-#agetfield = 0xcb, 3
-bgetfield = 0xcc, 3
-cgetfield = 0xcd, 3
-#dgetfield = 0xce, 3
-#fgetfield = 0xcf, 3
-igetfield = 0xd0, 3
-lgetfield = 0xd1, 3
-sgetfield = 0xd2, 3
-
-aputfield = 0xd3, 3
-bputfield = 0xd4, 3
-cputfield = 0xd5, 3
-#dputfield = 0xd6, 3
-#fputfield = 0xd7, 3
-iputfield = 0xd8, 3
-lputfield = 0xd9, 3
-#sputfield = 0xda, 3
-
-iaccess_0 = 0xdb, 4
-iaccess_1 = 0xdc, 4
-iaccess_2 = 0xdd, 4
-iaccess_3 = 0xde, 4
-
-#fast_iload = 0xdf, 2
-#fast_iload2 = 0xe0, 4
-#fast_icaload = 0xe1, 3
-
-invokevfinal = 0xe2, 3
-#linearswitch = 0xe3, 0
-#binaryswitch = 0xe4, 0
-
-iload_0_iconst_N = 231, 2
-iload_1_iconst_N = 232, 2
-iload_2_iconst_N = 233, 2
-iload_3_iconst_N = 234, 2
-iload_iconst_N = 235, 3
-invokeresolved = 236, 3
-iadd_istore_N = 237, 2
-isub_istore_N = 238, 2
-iand_istore_N = 239, 2
-ior_istore_N = 240, 2
-ixor_istore_N = 241, 2
-iadd_u4store = 242, 3
-isub_u4store = 243, 3
-iand_u4store = 244, 3
-ior_u4store = 245, 3
-ixor_u4store = 246, 3
-invokespecialresolved = 247, 3
-invokestaticresolved = 248, 3
-
-return_register_finalizer = 229, 0
-
-(nop) {
- DISPATCH \seq_len
-}
-
-(aconst_null,fconst_0) u4const_0 {
- DISPATCH_START \seq_len
- mov lr, #0
- DISPATCH_NEXT
- PUSH lr
- DISPATCH_FINISH
-}
-
-(iconst_m1,iconst_0,iconst_1,iconst_2,iconst_3,iconst_4,iconst_5) iconst_N {
- sub lr, r0, #opc_iconst_0
- DISPATCH_START \seq_len
- PUSH lr
- DISPATCH_FINISH
-}
-
-(lconst_0,dconst_0) u8const_0 {
- DISPATCH_START \seq_len
- mov tmp1, #0
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-(lconst_1) lconst_1 {
- DISPATCH_START \seq_len
- mov tmp2, #1
- DISPATCH_NEXT
- mov tmp1, #0
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH2 tmp2, tmp1
- DISPATCH_FINISH
-}
-
-(fconst_1) fconst_1 {
- DISPATCH_START \seq_len
- mov tmp1, #0x3f800000
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-(fconst_2) fconst_2 {
- DISPATCH_START \seq_len
- mov r2, #0x40000000
- DISPATCH_NEXT
- PUSH r2
- DISPATCH_FINISH
-}
-
-(dconst_1) dconst_1 {
- DISPATCH_START \seq_len
- mov tmp1, #0x3f000000
- DISPATCH_NEXT
- orr tmp1, tmp1, #0x00f00000
- DISPATCH_NEXT
- mov tmp2, #0
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH2 tmp2, tmp1
- DISPATCH_FINISH
-}
-
-(bipush) bipush {
- DISPATCH_START \seq_len
- mov tmp1, r2, lsl #24
- DISPATCH_NEXT
- mov tmp1, tmp1, asr #24
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-# r2 = [jpc, #1]
-# r1 = [jpc, #2]
-(sipush) sipush {
- DISPATCH_START \seq_len
- mov tmp1, r1
- DISPATCH_NEXT
- mov r2, r2, lsl #24
- DISPATCH_NEXT
- orr tmp1, tmp1, r2, asr #16
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-# r2 = [jpc, #1]
-(iload,fload,aload) u4load {
- DISPATCH_START \seq_len
- rsb tmp1, r2, #0
- DISPATCH_NEXT
- ldr tmp1, [locals, tmp1, lsl #2]
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-# r2 = [jpc, #1]
-(lload,dload) u8load {
- DISPATCH_START \seq_len
- sub r3, locals, r2, lsl #2
- DISPATCH_NEXT
- ldmda r3, {tmp2, tmp1}
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH2 tmp2, tmp1
- DISPATCH_FINISH
-}
-
-(aload_0,aload_1,aload_2,aload_3) {
- rsb tmp1, r0, #opc_aload_0
- DISPATCH_START \seq_len
- DISPATCH_NEXT
- ldr tmp1, [locals, tmp1, lsl #2]
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-(iload_0,iload_1,iload_2,iload_3) {
- rsb tmp1, r0, #opc_iload_0
- DISPATCH_START \seq_len
- DISPATCH_NEXT
- ldr tmp1, [locals, tmp1, lsl #2]
- DISPATCH_NEXT
- DISPATCH_NEXT
- DISPATCH_NEXT
- PUSH tmp1
- DISPATCH_FINISH
-}
-
-(fload_0,fload_1,fload_2,fload_3) {
- rsb tmp1, r0, #opc_fload_0
- DISPATCH_START \seq_len
- DISPATCH_NEXT
- ldr tmp1, [locals, tmp1, lsl #2]
More information about the distro-pkg-dev
mailing list