X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.s;h=dbe76ac52e2c845f47a8848271c2b9f2ee7977fd;hb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;hp=4208fec67194a313ac8a7a1cdb118c08b57f86e2;hpb=bf537655559ba25448315f7b7046b0b5390865bf;p=picodrive.git diff --git a/Pico/Memory.s b/Pico/Memory.s index 4208fec..dbe76ac 100644 --- a/Pico/Memory.s +++ b/Pico/Memory.s @@ -10,6 +10,7 @@ .include "port_config.s" .text +.align 4 @ default jump tables @@ -40,8 +41,8 @@ m_read8_def_table: .long m_read_null @ 0xB80000 - 0xBFFFFF .long m_read8_vdp @ 0xC00000 - 0xC7FFFF .long m_read8_vdp @ 0xC80000 - 0xCFFFFF - .long m_read_null @ 0xD00000 - 0xD7FFFF - .long m_read_null @ 0xD80000 - 0xDFFFFF + .long m_read8_vdp @ 0xD00000 - 0xD7FFFF + .long m_read8_vdp @ 0xD80000 - 0xDFFFFF .long m_read8_ram @ 0xE00000 - 0xE7FFFF .long m_read8_ram @ 0xE80000 - 0xEFFFFF .long m_read8_ram @ 0xF00000 - 0xF7FFFF @@ -73,9 +74,9 @@ m_read16_def_table: .long m_read_null @ 0xB00000 - 0xB7FFFF .long m_read_null @ 0xB80000 - 0xBFFFFF .long m_read16_vdp @ 0xC00000 - 0xC7FFFF - .long m_read_null @ 0xC80000 - 0xCFFFFF - .long m_read_null @ 0xD00000 - 0xD7FFFF - .long m_read_null @ 0xD80000 - 0xDFFFFF + .long m_read16_vdp @ 0xC80000 - 0xCFFFFF + .long m_read16_vdp @ 0xD00000 - 0xD7FFFF + .long m_read16_vdp @ 0xD80000 - 0xDFFFFF .long m_read16_ram @ 0xE00000 - 0xE7FFFF .long m_read16_ram @ 0xE80000 - 0xEFFFFF .long m_read16_ram @ 0xF00000 - 0xF7FFFF @@ -107,9 +108,9 @@ m_read32_def_table: .long m_read_null @ 0xB00000 - 0xB7FFFF .long m_read_null @ 0xB80000 - 0xBFFFFF .long m_read32_vdp @ 0xC00000 - 0xC7FFFF - .long m_read_null @ 0xC80000 - 0xCFFFFF - .long m_read_null @ 0xD00000 - 0xD7FFFF - .long m_read_null @ 0xD80000 - 0xDFFFFF + .long m_read32_vdp @ 0xC80000 - 0xCFFFFF + .long m_read32_vdp @ 0xD00000 - 0xD7FFFF + .long m_read32_vdp @ 0xD80000 - 0xDFFFFF .long m_read32_ram @ 0xE00000 - 0xE7FFFF .long m_read32_ram @ 0xE80000 - 0xEFFFFF .long m_read32_ram @ 0xF00000 - 0xF7FFFF @@ -119,6 +120,7 @@ m_read32_def_table: @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ .bss +.align 4 @.section .bss, "brw" @.data @@ -136,6 +138,7 @@ m_read32_table: @ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ .text +.align 4 .global PicoMemReset .global PicoRead8 @@ -184,7 +187,7 @@ PicoMemReset: @ update memhandlers according to ROM size ldr r1, =m_read8_above_rom ldr r0, =m_read8_table - mov r2, #16 + mov r2, #20 1: sub r2, r2, #1 cmp r2, r12 @@ -196,7 +199,7 @@ PicoMemReset: 2: ldr r1, =m_read16_above_rom ldr r0, =m_read16_table - mov r2, #16 + mov r2, #20 1: sub r2, r2, #1 cmp r2, r12 @@ -208,7 +211,7 @@ PicoMemReset: 2: ldr r1, =m_read32_above_rom ldr r0, =m_read32_table - mov r2, #16 + mov r2, #20 1: sub r2, r2, #1 cmp r2, r12 @@ -284,31 +287,14 @@ m_read8_rom4: @ 0x200000 - 0x27ffff, SRAM area orr r0, r0, #0x200000 cmp r0, r1 bgt m_read8_nosram - ldr r1, [r2, #4] @ SRam.start (1ci) + ldr r1, [r2, #4] @ SRam.start cmp r0, r1 blt m_read8_nosram - ldrb r1, [r3, #0x11] @ Pico.m.sram_reg (1ci) - sub r12,r0, #0x200000 - tst r1, #0x10 - bne m_read8_detected - cmp r12,#1 - ble m_read8_detected - tst r1, #1 - orrne r1, r1, #0x10 - strneb r1, [r3, #0x11] -m_read8_detected: - tst r1, #4 @ EEPROM read? - bne SRAMReadEEPROM -m_read8_noteeprom: - tst r1, #1 - beq m_read8_nosram - ldr r3, [r2] @ SRam.data - ldr r2, [r2, #4] @ SRam.start (1ci) - sub r3, r3, r2 - ldrb r0, [r3, r0] - bx lr + ldrb r1, [r3, #0x11] @ Pico.m.sram_reg + tst r1, #5 + bne SRAMRead m_read8_nosram: - ldr r1, [r3, #4] @ 1ci + ldr r1, [r3, #4] @ romsize cmp r0, r1 movgt r0, #0 bxgt lr @ bad location @@ -400,17 +386,14 @@ m_read8_misc2: cmp r2, #0x4000 mvnne r0, #0 bxne lr @ invalid -.if EXTERNAL_YM2612 ldr r1, =PicoOpt ldr r1, [r1] tst r1, #1 - beq m_read8_fake_ym2612 - tst r1, #0x200 - beq YM2612Read_ - b YM2612Read_940 -.else - b YM2612Read_ -.endif + + ldrne r1, =ym2612_st + ldrne r1, [r1] + ldrneb r0, [r1, #0x11] @ ym2612_st->status + bxne lr m_read8_fake_ym2612: ldr r3, =(Pico+0x22200) @@ -452,10 +435,26 @@ m_read8_ram: bx lr m_read8_above_rom: + @ might still be SRam (Micro Machines, HardBall '95) + ldr r2, =(SRam) + ldr r3, =(Pico+0x22200) + ldr r1, [r2, #8] @ SRam.end + cmp r0, r1 + bgt m_read8_ar_nosram + ldr r1, [r2, #4] @ SRam.start + cmp r0, r1 + blt m_read8_ar_nosram + ldrb r1, [r3, #0x11] @ Pico.m.sram_reg + tst r1, #5 + bne SRAMRead +m_read8_ar_nosram: + ldr r2, =PicoRead16Hook stmfd sp!,{r0,lr} + ldr r2, [r2] bic r0, r0, #1 mov r1, #8 - bl OtherRead16End + mov lr, pc + bx r2 ldmfd sp!,{r1,lr} tst r1, #1 moveq r0, r0, lsr #8 @@ -499,22 +498,17 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95) orr r0, r0, #0x200000 cmp r0, r1 bgt m_read16_nosram - ldrb r1, [r3, #0x11] @ Pico.m.sram_reg (2ci) - tst r1, #1 - beq m_read16_nosram - ldr r1, [r2, #4] @ SRam.start (1ci) + ldr r1, [r2, #4] @ SRam.start cmp r0, r1 blt m_read16_nosram - ldr r2, [r2] @ SRam.data (1ci) - sub r2, r2, r1 - ldrh r0, [r2, r0] @ 2ci - and r1, r0, #0xff - mov r0, r0, lsr #8 - orr r0, r0, r1, lsl #8 - bx lr - + ldrb r1, [r3, #0x11] @ Pico.m.sram_reg + tst r1, #5 + beq m_read16_nosram + stmfd sp!,{lr} + bl SRAMRead16 + ldmfd sp!,{pc} m_read16_nosram: - ldr r1, [r3, #4] @ 1ci + ldr r1, [r3, #4] @ romsize cmp r0, r1 movgt r0, #0 bxgt lr @ bad location @@ -573,7 +567,7 @@ m_read16_misc: b OtherRead16 m_read16_vdp: - tst r0, #0x70000 + tst r0, #0x70000 @ if ((a&0xe700e0)==0xc00000) tsteq r0, #0x000e0 bxne lr @ invalid read bic r0, r0, #1 @@ -587,9 +581,27 @@ m_read16_ram: bx lr m_read16_above_rom: + @ might still be SRam + ldr r2, =(SRam) + ldr r3, =(Pico+0x22200) + ldr r1, [r2, #8] @ SRam.end bic r0, r0, #1 + cmp r0, r1 + bgt m_read16_ar_nosram + ldr r1, [r2, #4] @ SRam.start + cmp r0, r1 + blt m_read16_ar_nosram + ldrb r1, [r3, #0x11] @ Pico.m.sram_reg + tst r1, #5 + beq m_read16_ar_nosram + stmfd sp!,{lr} + bl SRAMRead16 + ldmfd sp!,{pc} +m_read16_ar_nosram: + ldr r2, =PicoRead16Hook + ldr r2, [r2] mov r1, #16 - b OtherRead16End + bx r2 .pool @@ -631,26 +643,23 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?) orr r0, r0, #0x200000 cmp r0, r1 bgt m_read32_nosram - ldrb r1, [r3, #0x11] @ Pico.m.sram_reg (2ci) - tst r1, #1 - beq m_read32_nosram - ldr r1, [r2, #4] @ SRam.start (1ci) + ldr r1, [r2, #4] @ SRam.start cmp r0, r1 blt m_read32_nosram - ldr r2, [r2] @ SRam.data (1ci) - sub r2, r2, r1 - ldrh r0, [r2, r0]! @ (1ci) - ldrh r1, [r2, #2] - orr r0, r0, r0, lsl #16 - mov r0, r0, ror #8 - mov r0, r0, lsl #16 - orr r0, r0, r1, lsr #8 - and r1, r1, #0xff - orr r0, r0, r1, lsl #8 + ldrb r1, [r3, #0x11] @ Pico.m.sram_reg + tst r1, #5 + beq m_read32_nosram + stmfd sp!,{r0,lr} + bl SRAMRead16 + ldmfd sp!,{r1,lr} + stmfd sp!,{r0,lr} + add r0, r1, #2 + bl SRAMRead16 + ldmfd sp!,{r1,lr} + orr r0, r0, r1, lsl #16 bx lr - m_read32_nosram: - ldr r1, [r3, #4] @ (1ci) + ldr r1, [r3, #4] @ romsize cmp r0, r1 movgt r0, #0 bxgt lr @ bad location @@ -744,16 +753,20 @@ m_read32_ram: bx lr m_read32_above_rom: + ldr r2, =PicoRead16Hook bic r0, r0, #1 - stmfd sp!,{r0,lr} + ldr r2, [r2] mov r1, #32 - bl OtherRead16End + stmfd sp!,{r0,r2,lr} + mov lr, pc + bx r2 mov r1, r0 - ldmfd sp!,{r0} + ldmfd sp!,{r0,r2} stmfd sp!,{r1} add r0, r0, #2 mov r1, #32 - bl OtherRead16End + mov lr, pc + bx r2 ldmfd sp!,{r1,lr} orr r0, r0, r1, lsl #16 bx lr @@ -866,26 +879,21 @@ m_write8_z80_not_ram: and r2, r0, #0x6000 cmp r2, #0x4000 bne m_write8_z80_not_ym2612 - ldr r2, =PicoOpt + ldr r3, =PicoOpt and r0, r0, #3 - ldr r2, [r2] - tst r2, #1 + ldr r3, [r3] + mov r2, #0 @ is_from_z80 = 0 + tst r3, #1 bxeq lr stmfd sp!,{lr} -.if EXTERNAL_YM2612 - tst r2, #0x200 - ldreq r2, =YM2612Write_ - ldrne r2, =YM2612Write_940 - mov lr, pc - bx r2 -.else - bl YM2612Write_ -.endif + and r1, r1, #0xff + bl ym2612_write_local ldr r2, =emustatus ldmfd sp!,{lr} ldr r1, [r2] - orr r1, r0, r2 - str r1, [r2] @ emustatus|=YM2612Write(a&3, d); + and r0, r0, #1 + orr r1, r0, r1 + str r1, [r2] @ emustatus|=ym2612_write_local(a&3, d); bx lr m_write8_z80_not_ym2612: @ not too likely @@ -902,7 +910,7 @@ m_write8_z80_not_ym2612: @ not too likely m_write8_z80_bank_reg: ldr r3, =(Pico+0x22208) @ Pico.m ldrh r2, [r3, #0x0a] - mov r1, r1, lsr #8 + mov r1, r1, lsl #8 orr r2, r1, r2, lsr #1 bic r2, r2, #0xfe00 strh r2, [r3, #0x0a] @@ -918,7 +926,7 @@ m_write8_not_z80: bne OtherWrite8 m_write8_psg: ldr r2, =PicoOpt - mov r0, r1 + and r0, r1, #0xff ldr r2, [r2] tst r2, #2 bxeq lr