X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=fecdb0d6a6fc6247b410a45148d50ce3e42bc6dd;hb=4f65685b9708aa567f407fd8e0a42c6a7ff85673;hp=02c5a2c46819f9e290f8f21bb62d08357b69a486;hpb=66fdc0f0d590809fb0040d08fd57607bf80b1abc;p=picodrive.git diff --git a/Pico/Memory.s b/Pico/Memory.s index 02c5a2c..fecdb0d 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 @@ -19,7 +21,7 @@ m_read8_def_table: .long m_read8_rom5 @ 0x280000 - 0x2FFFFF .long m_read8_rom6 @ 0x300000 - 0x37FFFF .long m_read8_rom7 @ 0x380000 - 0x3FFFFF - .long m_read8_rom8 @ 0x400000 - 0x47FFFF + .long m_read8_rom8 @ 0x400000 - 0x47FFFF - for all those large ROM hacks .long m_read8_rom9 @ 0x480000 - 0x4FFFFF .long m_read8_romA @ 0x500000 - 0x57FFFF .long m_read8_romB @ 0x580000 - 0x5FFFFF @@ -27,10 +29,10 @@ m_read8_def_table: .long m_read8_romD @ 0x680000 - 0x6FFFFF .long m_read8_romE @ 0x700000 - 0x77FFFF .long m_read8_romF @ 0x780000 - 0x7FFFFF - .long m_read_null @ 0x800000 - 0x87FFFF - .long m_read_null @ 0x880000 - 0x8FFFFF - .long m_read_null @ 0x900000 - 0x97FFFF - .long m_read_null @ 0x980000 - 0x9FFFFF + .long m_read8_rom10 @ 0x800000 - 0x87FFFF + .long m_read8_rom11 @ 0x880000 - 0x8FFFFF + .long m_read8_rom12 @ 0x900000 - 0x97FFFF + .long m_read8_rom13 @ 0x980000 - 0x9FFFFF .long m_read8_misc @ 0xA00000 - 0xA7FFFF .long m_read_null @ 0xA80000 - 0xAFFFFF .long m_read_null @ 0xB00000 - 0xB7FFFF @@ -61,10 +63,10 @@ m_read16_def_table: .long m_read16_romD @ 0x680000 - 0x6FFFFF .long m_read16_romE @ 0x700000 - 0x77FFFF .long m_read16_romF @ 0x780000 - 0x7FFFFF - .long m_read_null @ 0x800000 - 0x87FFFF - .long m_read_null @ 0x880000 - 0x8FFFFF - .long m_read_null @ 0x900000 - 0x97FFFF - .long m_read_null @ 0x980000 - 0x9FFFFF + .long m_read16_rom10 @ 0x800000 - 0x87FFFF + .long m_read16_rom11 @ 0x880000 - 0x8FFFFF + .long m_read16_rom12 @ 0x900000 - 0x97FFFF + .long m_read16_rom13 @ 0x980000 - 0x9FFFFF .long m_read16_misc @ 0xA00000 - 0xA7FFFF .long m_read_null @ 0xA80000 - 0xAFFFFF .long m_read_null @ 0xB00000 - 0xB7FFFF @@ -95,10 +97,10 @@ m_read32_def_table: .long m_read32_romD @ 0x680000 - 0x6FFFFF .long m_read32_romE @ 0x700000 - 0x77FFFF .long m_read32_romF @ 0x780000 - 0x7FFFFF - .long m_read_null @ 0x800000 - 0x87FFFF - .long m_read_null @ 0x880000 - 0x8FFFFF - .long m_read_null @ 0x900000 - 0x97FFFF - .long m_read_null @ 0x980000 - 0x9FFFFF + .long m_read32_rom10 @ 0x800000 - 0x87FFFF + .long m_read32_rom11 @ 0x880000 - 0x8FFFFF + .long m_read32_rom12 @ 0x900000 - 0x97FFFF + .long m_read32_rom13 @ 0x980000 - 0x9FFFFF .long m_read32_misc @ 0xA00000 - 0xA7FFFF .long m_read_null @ 0xA80000 - 0xAFFFFF .long m_read_null @ 0xB00000 - 0xB7FFFF @@ -327,7 +329,6 @@ m_read8_rom8: @ 0x400000 - 0x47ffff m_read8_rom9: @ 0x480000 - 0x4fffff m_read8_rom 9 -@ is any ROM using that much? m_read8_romA: @ 0x500000 - 0x57ffff m_read8_rom 0xA @@ -346,6 +347,18 @@ m_read8_romE: @ 0x700000 - 0x77ffff m_read8_romF: @ 0x780000 - 0x7fffff m_read8_rom 0xF +m_read8_rom10: @ 0x800000 - 0x87ffff + m_read8_rom 0x10 + +m_read8_rom11: @ 0x880000 - 0x8fffff + m_read8_rom 0x11 + +m_read8_rom12: @ 0x900000 - 0x97ffff + m_read8_rom 0x12 + +m_read8_rom13: @ 0x980000 - 0x9fffff + m_read8_rom 0x13 + m_read8_misc: bic r2, r0, #0x00ff bic r2, r2, #0xbf00 @@ -441,6 +454,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 @@ -465,7 +479,6 @@ m_read16_rom8: @ 0x400000 - 0x47ffff m_read16_rom9: @ 0x480000 - 0x4fffff m_read16_rom 9 -@ is any ROM using that much? m_read16_romA: @ 0x500000 - 0x57ffff m_read16_rom 0xA @@ -484,19 +497,29 @@ m_read16_romE: @ 0x700000 - 0x77ffff m_read16_romF: @ 0x780000 - 0x7fffff m_read16_rom 0xF +m_read16_rom10: @ 0x800000 - 0x87ffff + m_read16_rom 0x10 + +m_read16_rom11: @ 0x880000 - 0x8fffff + m_read16_rom 0x11 + +m_read16_rom12: @ 0x900000 - 0x97ffff + m_read16_rom 0x12 + +m_read16_rom13: @ 0x980000 - 0x9fffff + m_read16_rom 0x13 + 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 +529,9 @@ m_read16_ram: bx lr m_read16_above_rom: - mov r1, #16 - ldr r2, =OtherRead16End bic r0, r0, #1 - bx r2 + mov r1, #16 + b OtherRead16End .pool @@ -568,6 +590,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 @@ -594,7 +617,6 @@ m_read32_rom8: @ 0x400000 - 0x47ffff m_read32_rom9: @ 0x480000 - 0x4fffff m_read32_rom 9 -@ is any ROM using that much? m_read32_romA: @ 0x500000 - 0x57ffff m_read32_rom 0xA @@ -613,6 +635,18 @@ m_read32_romE: @ 0x700000 - 0x77ffff m_read32_romF: @ 0x780000 - 0x7fffff m_read32_rom 0xF +m_read32_rom10: @ 0x800000 - 0x87ffff + m_read32_rom 0x10 + +m_read32_rom11: @ 0x880000 - 0x8fffff + m_read32_rom 0x11 + +m_read32_rom12: @ 0x900000 - 0x97ffff + m_read32_rom 0x12 + +m_read32_rom13: @ 0x980000 - 0x9fffff + m_read32_rom 0x13 + m_read32_misc: bic r0, r0, #1 stmfd sp!,{r0,lr} @@ -633,12 +667,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 @@ -679,8 +711,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 +737,4 @@ pwr_banking: str r12, [r2, r0, lsl #2] bx lr +