/hg/icedtea6: Edward Nevill (ed at camswl.com)
enevill at icedtea.classpath.org
enevill at icedtea.classpath.org
Mon Oct 5 06:10:02 PDT 2009
changeset c7458f207acf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7458f207acf
author: "Edward Nevill (ed at camswl.com)"
date: Mon Oct 05 14:13:48 2009 +0100
Edward Nevill (ed at camswl.com)
diffstat:
7 files changed, 288 insertions(+), 177 deletions(-)
ChangeLog | 8
contrib/jck/compile-native-code.sh | 3
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp | 8
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 283 +++++++++++---------
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 7
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp | 1
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 155 ++++++----
diffs (truncated from 1544 to 500 lines):
diff -r 66ad418c7b91 -r c7458f207acf ChangeLog
--- a/ChangeLog Thu Oct 01 11:24:55 2009 +0200
+++ b/ChangeLog Mon Oct 05 14:13:48 2009 +0100
@@ -1,3 +1,11 @@ 2009-10-01 Robert Schuster <robertschu
+2009-10-05 Edward Nevill <ed at camswl.com>
+
+ * Support for generation of native libraries for JCK on ARM
+ * Addition / updating of copyright notices
+ * Support for building icedteat-debug (incomplete)
+ * Minor performance optimisations
+ * Fix to stack overflow checking
+
2009-10-01 Robert Schuster <robertschuster at fsfe.org>
* configure.ac: Added --with-cacao-src-dir option.
diff -r 66ad418c7b91 -r c7458f207acf contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh Thu Oct 01 11:24:55 2009 +0200
+++ b/contrib/jck/compile-native-code.sh Mon Oct 05 14:13:48 2009 +0100
@@ -19,6 +19,9 @@ fi
arch=$(uname -m)
case "$arch" in
+ arm*)
+ MFLAG=
+ ;;
i?86|ppc)
MFLAG=-m32
;;
diff -r 66ad418c7b91 -r c7458f207acf ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Oct 01 11:24:55 2009 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp Mon Oct 05 14:13:48 2009 +0100
@@ -10,6 +10,10 @@
* 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.
*/
#include "incls/_precompiled.incl"
@@ -74,8 +78,8 @@ void VMStructs::print_vm_offsets(void)
print_def("THREAD_STATE", offset_of(JavaThread, _thread_state));
print_def("THREAD_DO_NOT_UNLOCK", offset_of(JavaThread, _do_not_unlock_if_synchronized));
- print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + ZeroStack::base_offset());
- print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + ZeroStack::sp_offset());
+ print_def("THREAD_JAVA_STACK_BASE", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::base_offset()));
+ print_def("THREAD_JAVA_SP", offset_of(JavaThread, _zero_stack) + in_bytes(ZeroStack::sp_offset()));
print_def("THREAD_TOP_ZERO_FRAME", offset_of(JavaThread, _top_zero_frame));
print_def("THREAD_SPECIALRUNTIMEEXITCONDITION", offset_of(JavaThread, _special_runtime_exit_condition));
nl();
diff -r 66ad418c7b91 -r c7458f207acf ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Oct 01 11:24:55 2009 +0200
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Oct 05 14:13:48 2009 +0100
@@ -1,3 +1,20 @@
+@ Copyright 2009 Edward Nevill
+@ 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.
+
#ifndef DISABLE_HW_FP
#define HW_FP
#endif
@@ -281,7 +298,7 @@ return_register_finalizer = 0xe5, 1
}
(aconst_null,fconst_0) u4const_0 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov lr, #0
DISPATCH_NEXT
PUSH lr
@@ -290,13 +307,13 @@ return_register_finalizer = 0xe5, 1
(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
+ DISPATCH_START_R2
PUSH lr
DISPATCH_FINISH
}
(lconst_0,dconst_0) u8const_0 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov tmp1, #0
DISPATCH_NEXT
PUSH tmp1
@@ -308,7 +325,7 @@ return_register_finalizer = 0xe5, 1
}
(lconst_1) lconst_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov tmp2, #1
DISPATCH_NEXT
mov tmp1, #0
@@ -320,7 +337,7 @@ return_register_finalizer = 0xe5, 1
}
(fconst_1) fconst_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov tmp1, #0x3f800000
DISPATCH_NEXT
PUSH tmp1
@@ -328,7 +345,7 @@ return_register_finalizer = 0xe5, 1
}
(fconst_2) fconst_2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov r2, #0x40000000
DISPATCH_NEXT
PUSH r2
@@ -336,7 +353,7 @@ return_register_finalizer = 0xe5, 1
}
(dconst_1) dconst_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
mov tmp1, #0x3f000000
DISPATCH_NEXT
orr tmp1, tmp1, #0x00f00000
@@ -363,12 +380,12 @@ return_register_finalizer = 0xe5, 1
@ r2 = [jpc, #1]
@ r1 = [jpc, #2]
(sipush) sipush {
- DISPATCH_START \seq_len
- mov tmp1, r1
+ ldrb r1, [jpc, #2]
+ DISPATCH_START \seq_len
DISPATCH_NEXT
mov r2, r2, lsl #24
- DISPATCH_NEXT
- orr tmp1, tmp1, r2, asr #16
+ orr tmp1, r1, r2, asr #16
+ DISPATCH_NEXT
DISPATCH_NEXT
DISPATCH_NEXT
PUSH tmp1
@@ -403,7 +420,7 @@ return_register_finalizer = 0xe5, 1
(aload_0,aload_1,aload_2,aload_3) {
rsb tmp1, r0, #opc_aload_0
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
ldr tmp1, [locals, tmp1, lsl #2]
DISPATCH_NEXT
@@ -415,7 +432,7 @@ return_register_finalizer = 0xe5, 1
(iload_0,iload_1,iload_2,iload_3) {
rsb tmp1, r0, #opc_iload_0
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
ldr tmp1, [locals, tmp1, lsl #2]
DISPATCH_NEXT
@@ -427,7 +444,7 @@ return_register_finalizer = 0xe5, 1
(fload_0,fload_1,fload_2,fload_3) {
rsb tmp1, r0, #opc_fload_0
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
ldr tmp1, [locals, tmp1, lsl #2]
DISPATCH_NEXT
@@ -438,7 +455,7 @@ return_register_finalizer = 0xe5, 1
}
(lload_0,dload_0) u8load_0 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldmda locals, {tmp2-tmp1}
DISPATCH_NEXT
PUSH tmp1
@@ -450,7 +467,7 @@ return_register_finalizer = 0xe5, 1
}
(lload_1,dload_1) u8load_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldmdb locals, {tmp2-tmp1}
DISPATCH_NEXT
PUSH tmp1
@@ -462,7 +479,7 @@ return_register_finalizer = 0xe5, 1
}
(lload_2,dload_2) u8load_2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldr tmp2, [locals, #-12]
DISPATCH_NEXT
ldr tmp1, [locals, #-8]
@@ -474,7 +491,7 @@ return_register_finalizer = 0xe5, 1
}
(lload_3,dload_3) u8load_3 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldr tmp2, [locals, #-16]
DISPATCH_NEXT
ldr tmp1, [locals, #-12]
@@ -486,8 +503,10 @@ return_register_finalizer = 0xe5, 1
}
(iaload,faload,aaload) u4aload {
- POP r2, r3 @ r2 = index, r3 = arrayref
- DISPATCH_START \seq_len
+ GET_STACK 1, r3
+ DISPATCH_START_R2_R0
+ POP r2
+ DISPATCH_START_R2_JPC
SW_NPC cmp r3, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry5:
@@ -500,13 +519,15 @@ return_register_finalizer = 0xe5, 1
DISPATCH_NEXT
ldr tmp1, [r3, #12]
DISPATCH_NEXT
- PUSH tmp1
+ PUT_STACK 0, tmp1
DISPATCH_FINISH
}
(laload,daload) u8aload {
- POP r2, r3
- DISPATCH_START \seq_len
+ GET_STACK 1, r3
+ DISPATCH_START_R2_R0
+ GET_STACK 0, r2
+ DISPATCH_START_R2_JPC
SW_NPC cmp r3, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry6:
@@ -520,13 +541,16 @@ return_register_finalizer = 0xe5, 1
DISPATCH_NEXT
ldr tmp1, [r3, #20]
DISPATCH_NEXT
- PUSH tmp2, tmp1
+ PUT_STACK 1, tmp1
+ PUT_STACK 0, tmp2
DISPATCH_FINISH
}
(baload) baload {
- POP r2, r3 @ r2 = index, r3 = arrayref
- DISPATCH_START \seq_len
+ GET_STACK 1, r3
+ DISPATCH_START_R2_R0
+ POP r2
+ DISPATCH_START_R2_JPC
SW_NPC cmp r3, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry7:
@@ -539,13 +563,15 @@ return_register_finalizer = 0xe5, 1
DISPATCH_NEXT
ldrsb tmp1, [r3, #12]
DISPATCH_NEXT
- PUSH tmp1
+ PUT_STACK 0, tmp1
DISPATCH_FINISH
}
(caload) caload {
- POP r2, r3 @ r2 = index, r3 = arrayref
- DISPATCH_START \seq_len
+ GET_STACK 1, r3
+ DISPATCH_START_R2_R0
+ POP r2
+ DISPATCH_START_R2_JPC
SW_NPC cmp r3, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry8:
@@ -558,13 +584,15 @@ return_register_finalizer = 0xe5, 1
DISPATCH_NEXT
ldrh tmp1, [r3, #12]
DISPATCH_NEXT
- PUSH tmp1
+ PUT_STACK 0, tmp1
DISPATCH_FINISH
}
(saload) saload {
- POP r2, r3 @ r2 = index, r3 = arrayref
- DISPATCH_START \seq_len
+ GET_STACK 1, r3
+ DISPATCH_START_R2_R0
+ POP r2
+ DISPATCH_START_R2_JPC
SW_NPC cmp r3, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry9:
@@ -577,7 +605,7 @@ return_register_finalizer = 0xe5, 1
DISPATCH_NEXT
ldrsh tmp1, [r3, #12]
DISPATCH_NEXT
- PUSH tmp1
+ PUT_STACK 0, tmp1
DISPATCH_FINISH
}
@@ -608,7 +636,7 @@ return_register_finalizer = 0xe5, 1
}
(astore_0,istore_0,fstore_0) u4store_0 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp1
DISPATCH_NEXT
@@ -619,7 +647,7 @@ return_register_finalizer = 0xe5, 1
}
(astore_1,istore_1,fstore_1) u4store_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp1
DISPATCH_NEXT
@@ -630,7 +658,7 @@ return_register_finalizer = 0xe5, 1
}
(astore_2,istore_2,fstore_2) u4store_2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp1
DISPATCH_NEXT
@@ -641,7 +669,7 @@ return_register_finalizer = 0xe5, 1
}
(astore_3,istore_3,fstore_3) u4store_3 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp1
DISPATCH_NEXT
@@ -652,7 +680,7 @@ return_register_finalizer = 0xe5, 1
}
(lstore_0,dstore_0) u8store_0 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp2, tmp1
DISPATCH_NEXT
@@ -663,7 +691,7 @@ return_register_finalizer = 0xe5, 1
}
(lstore_1,dstore_1) u8store_1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
DISPATCH_NEXT
POP tmp2, tmp1
DISPATCH_NEXT
@@ -674,7 +702,7 @@ return_register_finalizer = 0xe5, 1
}
(lstore_2,dstore_2) u8store_2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
POP tmp2, tmp1
DISPATCH_NEXT
str tmp2, [locals, #-12]
@@ -686,7 +714,7 @@ return_register_finalizer = 0xe5, 1
}
(lstore_3,dstore_3) u8store_3 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
POP tmp2, tmp1
DISPATCH_NEXT
str tmp2, [locals, #-16]
@@ -699,7 +727,7 @@ return_register_finalizer = 0xe5, 1
(iastore,fastore) u4astore {
POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
SW_NPC cmp tmp1, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry10:
@@ -715,8 +743,8 @@ return_register_finalizer = 0xe5, 1
}
(lastore,dastore) u8astore {
- POP r2, r3, tmp2, tmp1 @ r2,r3 = value, tmp2 = index, tmp1 = arrayref
- DISPATCH_START \seq_len
+ POP r1, r3, tmp2, tmp1 @ r1,r3 = value, tmp2 = index, tmp1 = arrayref
+ DISPATCH_START_R2
SW_NPC cmp tmp1, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry11:
@@ -726,7 +754,7 @@ return_register_finalizer = 0xe5, 1
bcs array_bound_exception_jpc_1_tmp2
DISPATCH_NEXT
add tmp2, tmp1, tmp2, lsl #3
- str r2, [tmp2, #16]
+ str r1, [tmp2, #16]
DISPATCH_NEXT
DISPATCH_NEXT
str r3, [tmp2, #20]
@@ -735,7 +763,7 @@ return_register_finalizer = 0xe5, 1
(bastore) bastore {
POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
SW_NPC cmp tmp1, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry12:
@@ -752,7 +780,7 @@ return_register_finalizer = 0xe5, 1
(castore,sastore) u2astore {
POP r3, tmp2, tmp1 @ r3 = value, tmp2 = index, tmp1 = arrayref
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
SW_NPC cmp tmp1, #0
SW_NPC beq null_ptr_exception_jpc_1
.abortentry13:
@@ -768,19 +796,19 @@ return_register_finalizer = 0xe5, 1
}
(pop) jpop {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
add stack, stack, #4
DISPATCH_FINISH
}
(pop2) jpop2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
add stack, stack, #8
DISPATCH_FINISH
}
(dup) dup {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldr lr, [stack, #4]
DISPATCH_NEXT
PUSH lr
@@ -788,7 +816,7 @@ return_register_finalizer = 0xe5, 1
}
(dup_x1) dup_x1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
POP r2, r3
DISPATCH_NEXT
PUSH r2
@@ -798,7 +826,7 @@ return_register_finalizer = 0xe5, 1
}
(dup_x2) dup_x2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
POP r2, r3, lr
DISPATCH_NEXT
PUSH r2
@@ -808,7 +836,7 @@ return_register_finalizer = 0xe5, 1
}
(dup2) dup2 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
ldmib stack, {r2, r3}
DISPATCH_NEXT
PUSH r2, r3
@@ -816,7 +844,7 @@ return_register_finalizer = 0xe5, 1
}
(dup2_x1) dup2_x1 {
- DISPATCH_START \seq_len
+ DISPATCH_START_R2
POP r2, r3, lr
DISPATCH_NEXT
PUSH r2, r3
@@ -826,7 +854,7 @@ return_register_finalizer = 0xe5, 1
}
(dup2_x2) dup2_x2 {
- DISPATCH_START \seq_len
More information about the distro-pkg-dev
mailing list