RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfixes in sram memhandlers

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@301 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-11-21 22:04:59 +00:00
parent c6196c0f01
commit 9dc0982919
5 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Pico/Memory.c
View file

@ -141,16 +141,33 @@ static
u32 SRAMRead(u32 a) u32 SRAMRead(u32 a)
{ {
unsigned int sreg = Pico.m.sram_reg; unsigned int sreg = Pico.m.sram_reg;
if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM if (!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
elprintf(EL_SRAMIO, "normal sram detected."); elprintf(EL_SRAMIO, "normal sram detected.");
Pico.m.sram_reg|=0x10; // should be normal SRAM Pico.m.sram_reg|=0x10; // should be normal SRAM
} }
if(sreg & 4) // EEPROM read if (sreg & 4) // EEPROM read
return SRAMReadEEPROM(); return SRAMReadEEPROM();
else // if(sreg & 1) // (sreg&5) is one of prerequisites else // if(sreg & 1) // (sreg&5) is one of prerequisites
return *(u8 *)(SRam.data-SRam.start+a); return *(u8 *)(SRam.data-SRam.start+a);
} }
#ifndef _ASM_MEMORY_C
static
#endif
u32 SRAMRead16(u32 a)
{
u32 d;
if (Pico.m.sram_reg & 4) {
d = SRAMReadEEPROM();
d |= d << 8;
} else {
u8 *pm=(u8 *)(SRam.data-SRam.start+a);
d =*pm++ << 8;
d|=*pm++;
}
return d;
}
static void SRAMWrite(u32 a, u32 d) static void SRAMWrite(u32 a, u32 d)
{ {
unsigned int sreg = Pico.m.sram_reg; unsigned int sreg = Pico.m.sram_reg;
@ -363,8 +380,7 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
#ifndef EMU_CORE_DEBUG #ifndef EMU_CORE_DEBUG
// sram // sram
if (a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) { if (a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
d = SRAMRead(a); d = SRAMRead16(a);
d |= d<<8;
elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc); elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc);
goto end; goto end;
} }
@ -400,8 +416,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
// sram // sram
if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) { if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
d = (SRAMRead(a)<<16)|SRAMRead(a+2); d = (SRAMRead16(a)<<16)|SRAMRead16(a+2);
d |= d<<8;
elprintf(EL_SRAMIO, "sram r32 [%06x] %08x @ %06x", a, d, SekPc); elprintf(EL_SRAMIO, "sram r32 [%06x] %08x @ %06x", a, d, SekPc);
goto end; goto end;
} }

11
Pico/Memory.s
View file

@ -502,8 +502,7 @@ m_read16_rom4: @ 0x200000 - 0x27ffff, SRAM area (NBA Live 95)
tst r1, #5 tst r1, #5
beq m_read16_nosram beq m_read16_nosram
stmfd sp!,{lr} stmfd sp!,{lr}
bl SRAMRead bl SRAMRead16
orr r0, r0, r0, lsl #8
ldmfd sp!,{pc} ldmfd sp!,{pc}
m_read16_nosram: m_read16_nosram:
ldr r1, [r3, #4] @ romsize ldr r1, [r3, #4] @ romsize
@ -593,8 +592,7 @@ m_read16_above_rom:
tst r1, #5 tst r1, #5
beq m_read16_ar_nosram beq m_read16_ar_nosram
stmfd sp!,{lr} stmfd sp!,{lr}
bl SRAMRead bl SRAMRead16
orr r0, r0, r0, lsl #8
ldmfd sp!,{pc} ldmfd sp!,{pc}
m_read16_ar_nosram: m_read16_ar_nosram:
mov r1, #16 mov r1, #16
@ -647,14 +645,13 @@ m_read32_rom4: @ 0x200000 - 0x27ffff, SRAM area (does any game do long reads?)
tst r1, #5 tst r1, #5
beq m_read32_nosram beq m_read32_nosram
stmfd sp!,{r0,lr} stmfd sp!,{r0,lr}
bl SRAMRead bl SRAMRead16
ldmfd sp!,{r1,lr} ldmfd sp!,{r1,lr}
stmfd sp!,{r0,lr} stmfd sp!,{r0,lr}
add r0, r1, #2 add r0, r1, #2
bl SRAMRead bl SRAMRead16
ldmfd sp!,{r1,lr} ldmfd sp!,{r1,lr}
orr r0, r0, r1, lsl #16 orr r0, r0, r1, lsl #16
orr r0, r0, r0, lsl #8
bx lr bx lr
m_read32_nosram: m_read32_nosram:
ldr r1, [r3, #4] @ romsize ldr r1, [r3, #4] @ romsize

2
Pico/MemoryCmn.c
View file

@ -217,7 +217,7 @@ void OtherWrite16(u32 a,u32 d)
#ifndef _CD_MEMORY_C #ifndef _CD_MEMORY_C
if (a >= SRam.start && a <= SRam.end) { if (a >= SRam.start && a <= SRam.end) {
elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d, SekPc); elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d, SekPc);
if ((a&0x16)==0x10) { // detected, not EEPROM, write not disabled if ((Pico.m.sram_reg&0x16)==0x10) { // detected, not EEPROM, write not disabled
u8 *pm=(u8 *)(SRam.data-SRam.start+a); u8 *pm=(u8 *)(SRam.data-SRam.start+a);
*pm++=d>>8; *pm++=d>>8;
*pm++=d; *pm++=d;

18
Pico/Memory_amips.s
View file

@ -260,29 +260,27 @@ m_read_neg1:
j SRAMRead j SRAMRead
nop nop
.elseif \size == 16 .elseif \size == 16
sw $ra, -4($sp)
jal SRAMRead16
addiu $sp, -4 addiu $sp, -4
jal SRAMRead
sw $ra, 0($sp)
lw $ra, 0($sp) lw $ra, 0($sp)
addiu $sp, 4
jr $ra jr $ra
ins $v0, $v0, 8, 8 addiu $sp, 4
.else .else
addiu $sp, -8 addiu $sp, -8
sw $a0, 4($sp)
jal SRAMRead
sw $ra, 0($sp) sw $ra, 0($sp)
sw $a0, 4($sp)
jal SRAMRead16
nop
lw $a0, 4($sp) lw $a0, 4($sp)
sw $v0, 4($sp) sw $v0, 4($sp)
jal SRAMRead jal SRAMRead16
addiu $a0, 2 addiu $a0, 2
lw $v1, 4($sp) lw $v1, 4($sp)
lw $ra, 0($sp) lw $ra, 0($sp)
addiu $sp, 8 addiu $sp, 8
ins $v0, $v1, 16, 16
sll $t0, $v0, 8
jr $ra jr $ra
or $v0, $t0 ins $v0, $v1, 16, 16
.endif .endif
# m_read_nosram: # m_read_nosram:
1: 1:

2
platform/psp/emu.c
View file

@ -21,7 +21,7 @@
#include "../common/lprintf.h" #include "../common/lprintf.h"
#include "../../Pico/PicoInt.h" #include "../../Pico/PicoInt.h"
#define OSD_FPS_X 424 #define OSD_FPS_X 432
// additional pspaudio imports, credits to crazyc // additional pspaudio imports, credits to crazyc
int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion? int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown); // play with conversion?