X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Flinkage_arm.s;h=b22d491fe2c05547011e3d71aa3db6b92fcd6975;hb=269bb29a66d856f02f00898a6f0ce961842ca248;hp=57fb3d22c4892b8704cc80fbf7d2712554bc472a;hpb=0bbd14543fec5fd4f5664b676771812663235252;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/linkage_arm.s b/libpcsxcore/new_dynarec/linkage_arm.s
index 57fb3d22..b22d491f 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.s
+++ b/libpcsxcore/new_dynarec/linkage_arm.s
@@ -203,6 +203,15 @@ memory_map = restore_candidate + 512
 	.size	memory_map, 4194304
 dynarec_local_end = memory_map + 4194304
 
+.macro load_var_adr reg var
+.if HAVE_ARMV7
+	movw	\reg, #:lower16:\var
+	movt	\reg, #:upper16:\var
+.else
+	ldr	\reg, =\var
+.endif
+.endm
+
 	.text
 	.align	2
 	.global	dyna_linker
@@ -210,14 +219,16 @@ dynarec_local_end = memory_map + 4194304
 dyna_linker:
 	/* r0 = virtual target address */
 	/* r1 = instruction to patch */
-	mov	r12, r0
-	mov	r6, #4096
-	mov	r2, #0x80000
 	ldr	r3, .jiptr
+	/* get_page */
+	lsr     r2, r0, #12
+	mov	r6, #4096
+	bic	r2, r2, #0xe0000
 	sub	r6, r6, #1
+	cmp     r2, #0x1000
 	ldr	r7, [r1]
-	eor	r2, r2, r12, lsr #12
-	and	r6, r6, r12, lsr #12
+	biclt   r2, #0x0e00
+	and	r6, r6, r2
 	cmp	r2, #2048
 	add	r12, r7, #2
 	orrcs	r2, r6, #2048
@@ -328,14 +339,16 @@ exec_pagefault:
 dyna_linker_ds:
 	/* r0 = virtual target address */
 	/* r1 = instruction to patch */
-	mov	r12, r0
-	mov	r6, #4096
-	mov	r2, #0x80000
 	ldr	r3, .jiptr
+	/* get_page */
+	lsr     r2, r0, #12
+	mov	r6, #4096
+	bic	r2, r2, #0xe0000
 	sub	r6, r6, #1
+	cmp     r2, #0x1000
 	ldr	r7, [r1]
-	eor	r2, r2, r12, lsr #12
-	and	r6, r6, r12, lsr #12
+	biclt   r2, #0x0e00
+	and	r6, r6, r2
 	cmp	r2, #2048
 	add	r12, r7, #2
 	orrcs	r2, r6, #2048
@@ -856,12 +869,7 @@ invalidate_addr_call:
 new_dyna_start:
 	/* ip is stored to conform EABI alignment */
 	stmfd	sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, lr}
-.if HAVE_ARMV7
-	movw	fp, #:lower16:dynarec_local
-	movt	fp, #:upper16:dynarec_local
-.else
-	ldr	fp, .dlptr
-.endif
+	load_var_adr fp, dynarec_local
 	ldr	r0, [fp, #pcaddr-dynarec_local]
 	bl	get_addr_ht
 	ldr	r1, [fp, #next_interupt-dynarec_local]
@@ -869,8 +877,6 @@ new_dyna_start:
 	str	r1, [fp, #last_count-dynarec_local]
 	sub	r10, r10, r1
 	mov	pc, r0
-.dlptr:
-	.word	dynarec_local
 	.size	new_dyna_start, .-new_dyna_start
 
 /* --------------------------------------- */
@@ -888,6 +894,7 @@ new_dyna_start:
 .global	ari_write_ram_mirror8
 .global	ari_write_ram_mirror16
 .global	ari_write_ram_mirror32
+.global	ari_write_ram_mirror_ro32
 .global	ari_read_bios8
 .global	ari_read_bios16
 .global	ari_read_bios32
@@ -980,6 +987,14 @@ ari_write_ram_mirror16:
 ari_write_ram_mirror32:
 	ari_write_ram_mirror (3<<11), word,
 
+ari_write_ram_mirror_ro32:
+	load_var_adr r0, pcsx_ram_is_ro
+	ldr	r0, [r0]
+	tst	r0, r0
+	movne	pc, lr
+	nop
+	b	ari_write_ram_mirror32
+
 
 .macro ari_read_bios_mirror bic_const op
 	ldr	r0, [fp, #address-dynarec_local]