notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: drop less obvious dead code
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
linkage_arm.S
diff --git
a/libpcsxcore/new_dynarec/linkage_arm.S
b/libpcsxcore/new_dynarec/linkage_arm.S
index
942b492
..
95af8b4
100644
(file)
--- a/
libpcsxcore/new_dynarec/linkage_arm.S
+++ b/
libpcsxcore/new_dynarec/linkage_arm.S
@@
-116,10
+116,10
@@
ptr_hash_table:
#endif
.macro load_varadr reg var
#endif
.macro load_varadr reg var
-#if defined(
__ARM_ARCH_7A__
) && !defined(__PIC__)
+#if defined(
HAVE_ARMV7
) && !defined(__PIC__)
movw \reg, #:lower16:\var
movt \reg, #:upper16:\var
movw \reg, #:lower16:\var
movt \reg, #:upper16:\var
-#elif defined(
__ARM_ARCH_7A__
) && defined(__MACH__)
+#elif defined(
HAVE_ARMV7
) && defined(__MACH__)
movw \reg, #:lower16:(\var-(1678f+8))
movt \reg, #:upper16:(\var-(1678f+8))
1678:
movw \reg, #:lower16:(\var-(1678f+8))
movt \reg, #:upper16:(\var-(1678f+8))
1678:
@@
-130,7
+130,7
@@
ptr_hash_table:
.endm
.macro load_varadr_ext reg var
.endm
.macro load_varadr_ext reg var
-#if defined(
__ARM_ARCH_7A__
) && defined(__MACH__) && defined(__PIC__)
+#if defined(
HAVE_ARMV7
) && defined(__MACH__) && defined(__PIC__)
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
movw \reg, #:lower16:(ptr_\var-(1678f+8))
movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
@@
-141,7
+141,7
@@
ptr_hash_table:
.endm
.macro mov_16 reg imm
.endm
.macro mov_16 reg imm
-#ifdef
__ARM_ARCH_7A__
+#ifdef
HAVE_ARMV7
movw \reg, #\imm
#else
mov \reg, #(\imm & 0x00ff)
movw \reg, #\imm
#else
mov \reg, #(\imm & 0x00ff)
@@
-150,7
+150,7
@@
ptr_hash_table:
.endm
.macro mov_24 reg imm
.endm
.macro mov_24 reg imm
-#ifdef
__ARM_ARCH_7A__
+#ifdef
HAVE_ARMV7
movw \reg, #(\imm & 0xffff)
movt \reg, #(\imm >> 16)
#else
movw \reg, #(\imm & 0xffff)
movt \reg, #(\imm >> 16)
#else
@@
-184,14
+184,10
@@
ptr_hash_table:
1:
movs r4, r5
beq 2f
1:
movs r4, r5
beq 2f
- ldr r3, [r5]
- ldr
r5, [r4, #12]
+ ldr r3, [r5]
/* ll_entry .vaddr */
+ ldr
d r4, r5, [r4, #8] /* ll_entry .next, .addr */
teq r3, r0
bne 1b
teq r3, r0
bne 1b
- ldr r3, [r4, #4]
- ldr r4, [r4, #8]
- tst r3, r3
- bne 1b
teq r4, r6
moveq pc, r4 /* Stale i-cache */
mov r8, r4
teq r4, r6
moveq pc, r4 /* Stale i-cache */
mov r8, r4