X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Flinkage_arm.s;h=bd5a03d40d0448b762bf02b328314c1ab0c27ba1;hb=dd4d5a35678c8ff7f9a7c0ac42be354671534f96;hp=23a69cffa4f470dff2a2900a148c97529efe831b;hpb=63cb0298408cf47e8e765b048f4d9af50c2e5eb7;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/linkage_arm.s b/libpcsxcore/new_dynarec/linkage_arm.s
index 23a69cff..bd5a03d4 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.s
+++ b/libpcsxcore/new_dynarec/linkage_arm.s
@@ -21,8 +21,6 @@
 
 /* .equiv HAVE_ARMV7, 1 */
 
-	.global	rdram
-rdram = 0x80000000
 	.global	dynarec_local
 	.global	reg
 	.global	hi
@@ -49,15 +47,17 @@ rdram = 0x80000000
 	.global mem_rtab
 	.global mem_wtab
 	.global psxH_ptr
+	.global zeromem_ptr
 	.global inv_code_start
 	.global inv_code_end
+	.global rcnts
 
 	.bss
 	.align	4
 	.type	dynarec_local, %object
 	.size	dynarec_local, dynarec_local_end-dynarec_local
 dynarec_local:
-	.space	dynarec_local_end-dynarec_local /*0x400630*/
+	.space	dynarec_local_end-dynarec_local
 next_interupt = dynarec_local + 64
 	.type	next_interupt, %object
 	.size	next_interupt, 4
@@ -120,7 +120,12 @@ intCycle = interrupt + 4
 	.size	intCycle, 256
 psxRegs_end = intCycle + 256
 
-mem_rtab = psxRegs_end
+rcnts = psxRegs_end
+	.type	rcnts, %object
+	.size	rcnts, 7*4*4
+rcnts_end = rcnts + 7*4*4
+
+mem_rtab = rcnts_end
 	.type	mem_rtab, %object
 	.size	mem_rtab, 4
 mem_wtab = mem_rtab + 4
@@ -129,7 +134,10 @@ mem_wtab = mem_rtab + 4
 psxH_ptr = mem_wtab + 4
 	.type	psxH_ptr, %object
 	.size	psxH_ptr, 4
-inv_code_start = psxH_ptr + 4
+zeromem_ptr = psxH_ptr + 4
+	.type	zeromem_ptr, %object
+	.size	zeromem_ptr, 4
+inv_code_start = zeromem_ptr + 4
 	.type	inv_code_start, %object
 	.size	inv_code_start, 4
 inv_code_end = inv_code_start + 4
@@ -140,8 +148,8 @@ branch_target = inv_code_end + 4
 	.size	branch_target, 4
 align0 = branch_target + 4 /* unused/alignment */
 	.type	align0, %object
-	.size	align0, 4
-mini_ht = align0 + 4
+	.size	align0, 16
+mini_ht = align0 + 16
 	.type	mini_ht, %object
 	.size	mini_ht, 256
 restore_candidate = mini_ht + 256
@@ -166,6 +174,26 @@ FCR31 = align0
 .endif
 .endm
 
+.macro mov_16 reg imm
+.if HAVE_ARMV7
+	movw	\reg, #\imm
+.else
+	mov	\reg, #(\imm & 0x00ff)
+	orr	\reg, #(\imm & 0xff00)
+.endif
+.endm
+
+.macro mov_24 reg imm
+.if HAVE_ARMV7
+	movw	\reg, #(\imm & 0xffff)
+	movt	\reg, #(\imm >> 16)
+.else
+	mov	\reg, #(\imm & 0x0000ff)
+	orr	\reg, #(\imm & 0x00ff00)
+	orr	\reg, #(\imm & 0xff0000)
+.endif
+.endm
+
 .macro dyna_linker_main
 	/* r0 = virtual target address */
 	/* r1 = instruction to patch */
@@ -772,6 +800,12 @@ new_dyna_start:
 .global	jump_handler_write_h
 .global jump_handle_swl
 .global jump_handle_swr
+.global rcnt0_read_count_m0
+.global rcnt0_read_count_m1
+.global rcnt1_read_count_m0
+.global rcnt1_read_count_m1
+.global rcnt2_read_count_m0
+.global rcnt2_read_count_m1
 
 
 .macro pcsx_read_mem readop tab_shift
@@ -922,4 +956,47 @@ jump_handle_swr:
 	bx	lr		@ TODO?
 
 
+.macro rcntx_read_mode0 num
+	/* r0 = address, r2 = cycles */
+	ldr	r3, [fp, #rcnts-dynarec_local+6*4+7*4*\num] @ cycleStart
+	mov	r0, r2, lsl #16
+	sub	r0, r3, lsl #16
+	lsr	r0, #16
+	bx	lr
+.endm
+
+rcnt0_read_count_m0:
+	rcntx_read_mode0 0
+
+rcnt1_read_count_m0:
+	rcntx_read_mode0 1
+
+rcnt2_read_count_m0:
+	rcntx_read_mode0 2
+
+rcnt0_read_count_m1:
+	/* r0 = address, r2 = cycles */
+	ldr	r3, [fp, #rcnts-dynarec_local+6*4+7*4*0] @ cycleStart
+	mov_16	r1, 0x3334
+	sub	r2, r2, r3
+	mul	r0, r1, r2		@ /= 5
+	lsr	r0, #16
+	bx	lr
+
+rcnt1_read_count_m1:
+	/* r0 = address, r2 = cycles */
+	ldr	r3, [fp, #rcnts-dynarec_local+6*4+7*4*1]
+	mov_24	r1, 0x1e6cde
+	sub	r2, r2, r3
+	umull	r3, r0, r1, r2		@ ~ /= hsync_cycles, max ~0x1e6cdd
+	bx	lr
+
+rcnt2_read_count_m1:
+	/* r0 = address, r2 = cycles */
+	ldr	r3, [fp, #rcnts-dynarec_local+6*4+7*4*2]
+	mov	r0, r2, lsl #16-3
+	sub	r0, r3, lsl #16-3
+	lsr	r0, #16			@ /= 8
+	bx	lr
+
 @ vim:filetype=armasm