X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=351c1a757311c9ab20ad902c2c953d02d643c3ce;hb=55ca4154a2e8aa3687c4f73f2c4c4d5fcdc5a836;hp=51778c4afa31af44d925d45c87252760b98103fd;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/Pico/Memory.s b/Pico/Memory.s
index 51778c4..351c1a7 100644
--- a/Pico/Memory.s
+++ b/Pico/Memory.s
@@ -1,7 +1,9 @@
+@ vim:filetype=armasm
+
 @ memory handlers with banking support for SSF II - The New Challengers
 @ mostly based on Gens code
 
-@ (c) Copyright 2006, notaz
+@ (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
 @ All Rights Reserved
 
 
@@ -384,7 +386,7 @@ m_read8_above_rom:
     stmfd   sp!,{r0,lr}
     bic     r0, r0, #1
     mov     r1, #8
-    bl      UnusualRead16
+    bl      OtherRead16End
     ldmfd   sp!,{r1,lr}
     tst     r1, #1
     moveq   r0, r0, lsr #8
@@ -441,6 +443,7 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95)
     mov     r0, r0, lsr #8
     orr     r0, r0, r1, lsl #8
     bx      lr
+
 m_read16_nosram:
     ldr     r1, [r3, #4]    @ 1ci
     cmp     r0, r1
@@ -485,18 +488,16 @@ m_read16_romF: @ 0x780000 - 0x7fffff
     m_read16_rom 0xF
 
 m_read16_misc:
-    mov     r1, #16
-    ldr     r2, =OtherRead16
     bic     r0, r0, #1
-    bx      r2
+    mov     r1, #16
+    b       OtherRead16
 
 m_read16_vdp:
     tst     r0, #0x70000
     tsteq   r0, #0x000e0
     bxne    lr              @ invalid read
-    ldr     r1, =PicoVideoRead
     bic     r0, r0, #1
-    bx      r1
+    b       PicoVideoRead
 
 m_read16_ram:
     ldr     r1, =Pico
@@ -506,10 +507,9 @@ m_read16_ram:
     bx      lr
 
 m_read16_above_rom:
-    mov     r1, #16
-    ldr     r2, =UnusualRead16
     bic     r0, r0, #1
-    bx      r2
+    mov     r1, #16
+    b       OtherRead16End
 
 .pool
 
@@ -568,6 +568,7 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?)
     and     r1, r1, #0xff
     orr     r0, r0, r1, lsl #8
     bx      lr
+
 m_read32_nosram:
     ldr     r1, [r3, #4]    @ (1ci)
     cmp     r0, r1
@@ -633,12 +634,10 @@ m_read32_vdp:
     tsteq   r0, #0x000e0
     bxne    lr              @ invalid read
     bic     r0, r0, #1
-    stmfd   sp!,{r0,lr}
+    add     r1, r0, #2
+    stmfd   sp!,{r1,lr}
     bl      PicoVideoRead
-    mov     r1, r0
-    ldmfd   sp!,{r0}
-    stmfd   sp!,{r1}
-    add     r0, r0, #2
+    swp     r0, r0, [sp]
     bl      PicoVideoRead
     ldmfd   sp!,{r1,lr}
     orr     r0, r0, r1, lsl #16
@@ -657,13 +656,13 @@ m_read32_above_rom:
     bic     r0, r0, #1
     stmfd   sp!,{r0,lr}
     mov     r1, #32
-    bl      UnusualRead16
+    bl      OtherRead16End
     mov     r1, r0
     ldmfd   sp!,{r0}
     stmfd   sp!,{r1}
     add     r0, r0, #2
     mov     r1, #32
-    bl      UnusualRead16
+    bl      OtherRead16End
     ldmfd   sp!,{r1,lr}
     orr     r0, r0, r1, lsl #16
     bx      lr
@@ -679,8 +678,11 @@ PicoWriteRomHW_SSF2: @ u32 a, u32 d
 
     @ sram register
     ldr     r2, =(Pico+0x22211) @ Pico.m.sram_reg
+    ldrb    r0, [r2]
     and     r1, r1, #3
-    strb    r1, [r2]
+    bic     r0, r0, #3
+    orr     r0, r0, r1
+    strb    r0, [r2]
     bx      lr
 
 pwr_banking:
@@ -702,3 +704,4 @@ pwr_banking:
     str     r12, [r2, r0, lsl #2]
  
     bx      lr
+