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

32x: some mapping corrections

Browse source
This commit is contained in:
notaz 2013-08-19 03:02:36 +03:00
parent 8ce9c3a782
commit eb35ce1506
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cpu/sh2/compiler.c
View file

@ -3308,7 +3308,8 @@ static void *dr_get_pc_base(u32 pc, int is_slave)
} }
else if ((pc & 0xc6000000) == 0x02000000) { else if ((pc & 0xc6000000) == 0x02000000) {
// ROM // ROM
ret = Pico.rom; if ((pc & 0x3fffff) < Pico.romsize)
ret = Pico.rom;
mask = 0x3fffff; mask = 0x3fffff;
} }

24
pico/32x/memory.c
View file

@ -571,7 +571,7 @@ static void p32x_vdp_write16(u32 a, u32 d, SH2 *sh2)
static u32 p32x_sh2reg_read16(u32 a, SH2 *sh2) static u32 p32x_sh2reg_read16(u32 a, SH2 *sh2)
{ {
u16 *r = Pico32x.regs; u16 *r = Pico32x.regs;
a &= 0xfe; // ? a &= 0x3e;
switch (a) { switch (a) {
case 0x00: // adapter/irq ctl case 0x00: // adapter/irq ctl
@ -628,7 +628,7 @@ static void p32x_sh2reg_write8(u32 a, u32 d, SH2 *sh2)
u16 *r = Pico32x.regs; u16 *r = Pico32x.regs;
u32 old; u32 old;
a &= 0xff; a &= 0x3f;
sh2->poll_addr = 0; sh2->poll_addr = 0;
switch (a) { switch (a) {
@ -724,7 +724,7 @@ static void p32x_sh2reg_write8(u32 a, u32 d, SH2 *sh2)
static void p32x_sh2reg_write16(u32 a, u32 d, SH2 *sh2) static void p32x_sh2reg_write16(u32 a, u32 d, SH2 *sh2)
{ {
a &= 0xfe; a &= 0x3e;
sh2->poll_addr = 0; sh2->poll_addr = 0;
@ -1194,13 +1194,13 @@ static u32 sh2_read8_cs0(u32 a, SH2 *sh2)
sh2_burn_cycles(sh2, 1*2); sh2_burn_cycles(sh2, 1*2);
// 0x3ff00 is veridied // 0x3ffc0 is veridied
if ((a & 0x3ff00) == 0x4000) { if ((a & 0x3ffc0) == 0x4000) {
d = p32x_sh2reg_read16(a, sh2); d = p32x_sh2reg_read16(a, sh2);
goto out_16to8; goto out_16to8;
} }
if ((a & 0x3ff00) == 0x4100) { if ((a & 0x3fff0) == 0x4100) {
d = p32x_vdp_read16(a); d = p32x_vdp_read16(a);
sh2_poll_detect(sh2, a, SH2_STATE_VPOLL, 7); sh2_poll_detect(sh2, a, SH2_STATE_VPOLL, 7);
goto out_16to8; goto out_16to8;
@ -1249,14 +1249,14 @@ static u32 sh2_read16_cs0(u32 a, SH2 *sh2)
sh2_burn_cycles(sh2, 1*2); sh2_burn_cycles(sh2, 1*2);
if ((a & 0x3ff00) == 0x4000) { if ((a & 0x3ffc0) == 0x4000) {
d = p32x_sh2reg_read16(a, sh2); d = p32x_sh2reg_read16(a, sh2);
if (!(EL_LOGMASK & EL_PWM) && (a & 0x30) == 0x30) // hide PWM if (!(EL_LOGMASK & EL_PWM) && (a & 0x30) == 0x30) // hide PWM
return d; return d;
goto out; goto out;
} }
if ((a & 0x3ff00) == 0x4100) { if ((a & 0x3fff0) == 0x4100) {
d = p32x_vdp_read16(a); d = p32x_vdp_read16(a);
sh2_poll_detect(sh2, a, SH2_STATE_VPOLL, 7); sh2_poll_detect(sh2, a, SH2_STATE_VPOLL, 7);
goto out; goto out;
@ -1303,14 +1303,14 @@ static void REGPARM(3) sh2_write8_cs0(u32 a, u32 d, SH2 *sh2)
a, d & 0xff, sh2_pc(sh2)); a, d & 0xff, sh2_pc(sh2));
if (Pico32x.regs[0] & P32XS_FM) { if (Pico32x.regs[0] & P32XS_FM) {
if ((a & 0x3ff00) == 0x4100) { if ((a & 0x3fff0) == 0x4100) {
sh2->poll_addr = 0; sh2->poll_addr = 0;
p32x_vdp_write8(a, d); p32x_vdp_write8(a, d);
return; return;
} }
} }
if ((a & 0x3ff00) == 0x4000) { if ((a & 0x3ffc0) == 0x4000) {
p32x_sh2reg_write8(a, d, sh2); p32x_sh2reg_write8(a, d, sh2);
return; return;
} }
@ -1374,7 +1374,7 @@ static void REGPARM(3) sh2_write16_cs0(u32 a, u32 d, SH2 *sh2)
a, d & 0xffff, sh2_pc(sh2)); a, d & 0xffff, sh2_pc(sh2));
if (Pico32x.regs[0] & P32XS_FM) { if (Pico32x.regs[0] & P32XS_FM) {
if ((a & 0x3ff00) == 0x4100) { if ((a & 0x3fff0) == 0x4100) {
sh2->poll_addr = 0; sh2->poll_addr = 0;
p32x_vdp_write16(a, d, sh2); p32x_vdp_write16(a, d, sh2);
return; return;
@ -1387,7 +1387,7 @@ static void REGPARM(3) sh2_write16_cs0(u32 a, u32 d, SH2 *sh2)
} }
} }
if ((a & 0x3ff00) == 0x4000) { if ((a & 0x3ffc0) == 0x4000) {
p32x_sh2reg_write16(a, d, sh2); p32x_sh2reg_write16(a, d, sh2);
return; return;
} }