removed some indirect jumps

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@236 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Memory.s b/Pico/Memory.s
index a3f2bdc..4208fec 100644 (file)
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -298,8 +298,7 @@ m_read8_rom4: @ 0x200000 - 0x27ffff, SRAM area
     strneb  r1, [r3, #0x11]\r
 m_read8_detected:\r
     tst     r1, #4          @ EEPROM read?\r
-    ldrne   r0, =SRAMReadEEPROM @ (1ci if ne)\r
-    bxne    r0\r
+    bne     SRAMReadEEPROM\r
 m_read8_noteeprom:\r
     tst     r1, #1\r
     beq     m_read8_nosram\r
@@ -373,10 +372,9 @@ m_read8_misc_io:
     ands    r0, r0, #0x1e\r
     beq     m_read8_misc_hwreg\r
     cmp     r0, #4\r
-    ldrle   r2, =PadRead\r
     movlt   r0, #0\r
     moveq   r0, #1\r
-    bxle    r2\r
+    ble     PadRead\r
     ldr     r3, =(Pico+0x22000)\r
     mov     r0, r0, lsr #1  @ other IO ports (Pico.ioports[a])\r
     ldrb    r0, [r3, r0]\r
@@ -391,15 +389,13 @@ m_read8_misc2:
     mov     r2,     #0xa10000 @ games also like to poll busreq,\r
     orr     r2, r2, #0x001100 @ so we'll try it now\r
     cmp     r0, r2\r
-    ldreq   r2, =z80ReadBusReq\r
-    bxeq    r2\r
+    beq     z80ReadBusReq\r
 \r
     and     r2, r0, #0xff0000 @ finally it might be\r
     cmp     r2,     #0xa00000 @ z80 area\r
     bne     m_read8_misc3\r
     tst     r0, #0x4000\r
-    ldreq   r2, =z80Read8     @ z80 RAM\r
-    bxeq    r2\r
+    beq     z80Read8          @ z80 RAM\r
     and     r2, r0, #0x6000\r
     cmp     r2, #0x4000\r
     mvnne   r0, #0\r
@@ -410,12 +406,11 @@ m_read8_misc2:
     tst     r1, #1\r
     beq     m_read8_fake_ym2612\r
     tst     r1, #0x200\r
-    ldreq   r2, =YM2612Read_\r
-    ldrne   r2, =YM2612Read_940\r
+    beq     YM2612Read_\r
+    b       YM2612Read_940\r
 .else\r
-    ldr     r2, =YM2612Read_\r
+    b       YM2612Read_\r
 .endif\r
-    bx      r2                @ ym2612\r
 \r
 m_read8_fake_ym2612:\r
     ldr     r3, =(Pico+0x22200)\r
@@ -917,22 +912,15 @@ m_write8_z80_bank_reg:
 m_write8_not_z80:\r
     and     r2, r0, #0xe70000\r
     cmp     r2, #0xc00000    @ VDP area?\r
-    bne     m_write8_misc4\r
+    bne     OtherWrite8      @ passthrough\r
     and     r2, r0, #0xf9\r
     cmp     r2, #0x11\r
-    bne     m_write8_misc4\r
+    bne     OtherWrite8\r
 m_write8_psg:\r
     ldr     r2, =PicoOpt\r
     mov     r0, r1\r
     ldr     r2, [r2]\r
     tst     r2, #2\r
     bxeq    lr\r
-    ldr     r2, =SN76496Write\r
-    bx      r2\r
-    \r
-\r
-m_write8_misc4:\r
-    @ passthrough\r
-    ldr     r2, =OtherWrite8\r
-    bx      r2\r
+    b       SN76496Write\r
 \r