/hg/icedtea6: 2 new changesets
enevill at icedtea.classpath.org
enevill at icedtea.classpath.org
Fri Oct 9 09:17:56 PDT 2009
changeset c1f0b5da7bc3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c1f0b5da7bc3
author: "Edward Nevill (ed at camswl.com)"
date: Fri Oct 09 17:20:24 2009 +0100
Edward Nevill
changeset 594e47c327ad in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=594e47c327ad
author: "Edward Nevill (ed at camswl.com)"
date: Fri Oct 09 17:21:41 2009 +0100
Edward Nevill
diffstat:
4 files changed, 58 insertions(+), 2 deletions(-)
ChangeLog | 4 +
Makefile.am | 6 ++
configure.ac | 2
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 48 +++++++++++++++++++-
diffs (148 lines):
diff -r ca84eeb0fcf1 -r 594e47c327ad ChangeLog
--- a/ChangeLog Fri Oct 09 13:10:46 2009 +0100
+++ b/ChangeLog Fri Oct 09 17:21:41 2009 +0100
@@ -1,3 +1,7 @@ 2009-10-09 Edward Nevill <ed at camswl.c
+2009-10-09 Edward Nevill <ed at camswl.com>
+
+ * Added initial support for Shark + ARM asm
+
2009-10-09 Edward Nevill <ed at camswl.com>
* Bug fix to irem
diff -r ca84eeb0fcf1 -r 594e47c327ad Makefile.am
--- a/Makefile.am Fri Oct 09 13:10:46 2009 +0100
+++ b/Makefile.am Fri Oct 09 17:21:41 2009 +0100
@@ -504,8 +504,14 @@ ZERO_ASM_BC_ASM_COND = $(shell test -f $
# These options are provided mainly to assist debugging by returning the bytecode interpreter
# to a 'vanilla' interpreter.
#
+if SHARK_BUILD
+${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
+ gcc -E -DDISABLE_NOTICE_SAFEPOINTS - < $< | $(abs_top_srcdir)/mkbc - $@
+else
${ZERO_ASM_BC_ASM}: ${ZERO_ASM_BC_DEF} $(abs_top_srcdir)/mkbc
gcc -E - < $< | $(abs_top_srcdir)/mkbc - $@
+endif
+
# Link ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
diff -r ca84eeb0fcf1 -r 594e47c327ad configure.ac
--- a/configure.ac Fri Oct 09 13:10:46 2009 +0100
+++ b/configure.ac Fri Oct 09 17:21:41 2009 +0100
@@ -565,7 +565,7 @@ AC_SUBST(LIBFFI_LIBS)
if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
FIND_TOOL([LLVM_CONFIG], [llvm-config])
- llvm_components="engine nativecodegen"
+ llvm_components="jit engine nativecodegen"
LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
sed -e 's/-D_DEBUG//g'`
diff -r ca84eeb0fcf1 -r 594e47c327ad ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 09 13:10:46 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Oct 09 17:21:41 2009 +0100
@@ -16,6 +16,10 @@
@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#ifdef HOTSPOT_ASM
+
+#ifdef SHARK
+#define USE_COMPILER
+#endif
#define ARMv4
@@ -3989,12 +3993,34 @@ normal_entry_synchronized:
add dispatch, r1, r0
ldr r0, [istate, #ISTATE_METHOD]
CACHE_STACK
+ USEC ldr r2, [r0, #METHOD_INVOCATIONCOUNTER]
+ USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX]
+ USEC add r2, r2, #INVOCATIONCOUNTER_COUNTINCREMENT
+ USEC ldr lr, [lr]
+ USEC str r2, [r0, #METHOD_INVOCATIONCOUNTER]
+ USEC cmp r2, lr
+ ldr r3, [r0, #METHOD_ACCESSFLAGS]
+ USEC bcs sync_method_entry_freq_count_overflow
+ CACHE_LOCALS
+ tst r3, #JVM_ACC_SYNCHRONIZED
+ CACHE_CP
+ bne normal_do_synchronization
+ DISPATCH 0
+
+#ifdef USE_COMPILER
+sync_method_entry_freq_count_overflow:
+ mov r1, #0
+ mov r0, tmp1
+ bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+ ldr r0, [istate, #ISTATE_METHOD]
+ CACHE_JPC
ldr r3, [r0, #METHOD_ACCESSFLAGS]
CACHE_LOCALS
tst r3, #JVM_ACC_SYNCHRONIZED
CACHE_CP
bne normal_do_synchronization
DISPATCH 0
+#endif
do_execute_java_bytecodes_restore_locals_and_jpc:
CACHE_JPC
@@ -4547,11 +4573,18 @@ 3:
DISPATCH_START 48
ldr constpool, [constpool, #CONSTANTPOOL_CACHE]
str ip, [tmp1, #THREAD_TOP_ZERO_FRAME]
+ USEC ldr r3, [r10, #METHOD_INVOCATIONCOUNTER]
str ip, [tmp1, #THREAD_LAST_JAVA_SP]
DISPATCH_NEXT
+ USEC ldr lr, [dispatch, #InterpreterInvocationLimit_Address-XXX]
+ USEC add r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT
str tmp1, [istate, #ISTATE_THREAD]
+ USEC ldr lr, [lr]
+ USEC str r3, [tmp2, #METHOD_INVOCATIONCOUNTER]
str locals, [istate, #ISTATE_LOCALS]
+ USEC cmp r3, lr
str constpool, [istate, #ISTATE_CONSTANTS]
+ USEC bcs method_entry_freq_count_overflow
DISPATCH_NEXT
DISPATCH_NEXT
DISPATCH_NEXT
@@ -4560,6 +4593,18 @@ 3:
@ str lr, [istate, #ISTATE_PREV_LINK]
@ str lr, [istate, #ISTATE_CALLEE]
DISPATCH_FINISH
+#ifdef USE_COMPILER
+method_entry_freq_count_overflow:
+ DECACHE_JPC
+ str r10, [istate, #ISTATE_METHOD]
+ mov r1, #0
+ mov r0, tmp1
+ bl _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+ CACHE_JPC
+ CACHE_CP
+ DISPATCH 0
+#endif
+
handle_return:
@ CHECK_CONSTPOOL
@@ -6302,6 +6347,7 @@ adcon_init_table:
.word PrintCommandLineFlags(GOT)
.word _ZN11JvmtiExport28_can_post_interpreter_eventsE(GOT)
.word UseCompiler(GOT)
+ .word _ZN17InvocationCounter26InterpreterInvocationLimitE(GOT)
.word 0
ALIGN_DATA
@@ -6581,10 +6627,10 @@ CodeTrace_Buffer_Base:
CodeTrace_Buffer_Base:
.space CODETRACE_BUFFER_SIZE
#endif
- .word 0
DispatchBreakPoint: .word 0
VFP_Flag: .word 0
CodeTrace_Idx: .word 0
+InterpreterInvocationLimit_Address: .word 0
UseCompiler_Address: .word 0
can_post_interpreter_events: .word 0
PrintCommandLineFlags_Address: .word 0
More information about the distro-pkg-dev
mailing list