Request to push changes to make ARM asm and Shark work

[Edward Nevill]

Hi Folks,

The following changes will make the ARM assembler work with Shark.

It doesn't work with OSR yet, also it needs to be tuned correctly.

Gary:

I have had to add a change to the top level Makefile.am to allow different
building of arm_bytecodes.s from arm_bytecodes.def for SHARK and non SHARK
builds. I dont think the top level makefile is the right place for this
rule as I will probably need to make more changes. Any objections if
I move this rule down into zero.make. The rules to build 'mkbc' itself
and the source of mkbc can remain in the top level.

ChangeLog to follow

Regards,
Ed.

--- CUT HERE -----------------------------------------------------------------------------
diff -ruNE orig/icedtea6/Makefile.am new/icedtea6/Makefile.am
--- orig/icedtea6/Makefile.am	2009-10-09 13:05:43.000000000 +0100
+++ new/icedtea6/Makefile.am	2009-10-09 14:41:28.000000000 +0100
@@ -504,8 +504,14 @@
 # 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 -ruNE orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- orig/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-10-09 13:08:16.000000000 +0100
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-10-09 14:35:10.000000000 +0100
@@ -17,6 +17,10 @@
 
 #ifdef HOTSPOT_ASM
 
+#ifdef SHARK
+#define USE_COMPILER
+#endif
+
 #define ARMv4
 
 #ifndef DISABLE_NOTICE_SAFEPOINTS
@@ -3989,12 +3993,34 @@
 	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 @@
 	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 @@
 @        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 @@
 	.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:
 	.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