X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Flinkage_arm.s;h=54511108cc47e76ea0964d602fce620f5da7cf8e;hp=d1a93e86330fcef6cca842af83ff1bfcc83b1c13;hb=67ba0fb4fa3f120c4156ca7d6155c51b7623e84f;hpb=822b27d12f2c2a66f8de4ff7109f452048c5d899

diff --git a/libpcsxcore/new_dynarec/linkage_arm.s b/libpcsxcore/new_dynarec/linkage_arm.s
index d1a93e86..54511108 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.s
+++ b/libpcsxcore/new_dynarec/linkage_arm.s
@@ -35,6 +35,8 @@ rdram = 0x80000000
 	.global	hi
 	.global	lo
 	.global reg_cop0
+	.global reg_cop2d
+	.global reg_cop2c
 	.global	FCR0
 	.global	FCR31
 	.global	next_interupt
@@ -58,8 +60,6 @@ rdram = 0x80000000
 	.global	memory_map
 	/* psx */
 	.global psxRegs
-	.global psxHLEt_addr
-	.global code
 
 	.bss
 	.align	4
@@ -139,7 +139,6 @@ pcaddr = PC
 code = PC + 4
 	.type	code, %object
 	.size	code, 4
-.global cycle
 cycle = code + 4
 	.type	cycle, %object
 	.size	cycle, 4
@@ -151,13 +150,10 @@ intCycle = interrupt + 4
 	.size	intCycle, 128
 psxRegs_end = intCycle + 128
 
-psxHLEt_addr = psxRegs_end
-	.type	psxHLEt_addr, %object
-	.size	psxHLEt_addr, 4
-align0 = psxHLEt_addr + 4 /* just for alignment */
+align0 = psxRegs_end /* just for alignment */
 	.type	align0, %object
-	.size	align0, 4
-branch_target = align0 + 4
+	.size	align0, 8
+branch_target = align0 + 8
 	.type	branch_target, %object
 	.size	branch_target, 4
 mini_ht = branch_target + 4
@@ -676,12 +672,10 @@ pcsx_return:
 jump_hlecall:
 	ldr	r2, [fp, #last_count-dynarec_local]
 	str	r0, [fp, #pcaddr-dynarec_local]
-	and	r1, r1, #7
 	add	r2, r2, r10
-	ldr	r3, [fp, #psxHLEt_addr-dynarec_local] /* psxHLEt */
 	str	r2, [fp, #cycle-dynarec_local] /* PCSX cycle counter */
 	adr	lr, pcsx_return
-	ldr	pc, [r3, r1, lsl #2]
+	bx	r1
 	.size	jump_hlecall, .-jump_hlecall
 
 new_dyna_leave: