improvements for type issues

This commit is contained in:
kub 2021-04-22 23:28:35 +02:00
parent 0d8d97f87c
commit 91ea9406e2
9 changed files with 39 additions and 39 deletions

View file

@ -142,9 +142,9 @@ void p32x_reset_sh2s(void)
unsigned int vbr;
// initial data
idl_src = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3d4)) & ~0xf0000000;
idl_dst = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3d8)) & ~0xf0000000;
idl_size= CPU_BE2(*(unsigned int *)(Pico.rom + 0x3dc));
idl_src = CPU_BE2(*(u32 *)(Pico.rom + 0x3d4)) & ~0xf0000000;
idl_dst = CPU_BE2(*(u32 *)(Pico.rom + 0x3d8)) & ~0xf0000000;
idl_size= CPU_BE2(*(u32 *)(Pico.rom + 0x3dc));
if (idl_size > Pico.romsize || idl_src + idl_size > Pico.romsize ||
idl_size > 0x40000 || idl_dst + idl_size > 0x40000 || (idl_src & 3) || (idl_dst & 3)) {
elprintf(EL_STATUS|EL_ANOMALY, "32x: invalid initial data ptrs: %06x -> %06x, %06x",
@ -154,11 +154,11 @@ void p32x_reset_sh2s(void)
memcpy(Pico32xMem->sdram + idl_dst, Pico.rom + idl_src, idl_size);
// VBR
vbr = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3e8));
vbr = CPU_BE2(*(u32 *)(Pico.rom + 0x3e8));
sh2_set_vbr(0, vbr);
// checksum and M_OK
Pico32x.regs[0x28 / 2] = *(unsigned short *)(Pico.rom + 0x18e);
Pico32x.regs[0x28 / 2] = *(u16 *)(Pico.rom + 0x18e);
}
// program will set M_OK
}
@ -168,7 +168,7 @@ void p32x_reset_sh2s(void)
unsigned int vbr;
// GBR/VBR
vbr = CPU_BE2(*(unsigned int *)(Pico.rom + 0x3ec));
vbr = CPU_BE2(*(u32 *)(Pico.rom + 0x3ec));
sh2_set_gbr(1, 0x20004000);
sh2_set_vbr(1, vbr);
// program will set S_OK