m293: Fix alignment and update

This commit is contained in:
negativeExponent
2020-11-17 00:18:31 +08:00
parent 14b689cde6
commit 0cc55ba1f1

View File

@@ -34,44 +34,49 @@ static void Sync(void) {
uint8 bank = ((regs[1] << 5) & 0x20) | ((regs[1] >> 1) & 0x18); uint8 bank = ((regs[1] << 5) & 0x20) | ((regs[1] >> 1) & 0x18);
uint8 block = (regs[0] & 7); uint8 block = (regs[0] & 7);
switch (mode) { switch (mode) {
case 0: /* UNROM */ case 0: /* UNROM */
setprg16(0x8000, bank | block); setprg16(0x8000, bank | block);
setprg16(0xC000, bank | 7); setprg16(0xC000, bank | 7);
break; break;
case 1: case 1:
setprg16(0x8000, bank | block & 0xFE); setprg16(0x8000, bank | block & 0xFE);
setprg16(0xC000, bank | 7); setprg16(0xC000, bank | 7);
break; break;
case 2: /* NROM-128 */ case 2: /* NROM-128 */
setprg16(0x8000, bank | block); setprg16(0x8000, bank | block);
setprg16(0xC000, bank | block); setprg16(0xC000, bank | block);
break; break;
case 3: /* NROM-256 */ case 3: /* NROM-256 */
setprg32(0x8000, (bank | block) >> 1); setprg32(0x8000, (bank | block) >> 1);
break; break;
} }
setchr8(0); setchr8(0);
setmirror(((regs[1] >> 7) & 1) ^ 1); setmirror(((regs[1] >> 7) & 1) ^ 1);
} }
static DECLFW(M293Write1) { static DECLFW(M293Write1) {
if (A < 0xA000) regs[0] = V; regs[0] = V;
regs[1] = V; regs[1] = V;
Sync(); Sync();
} }
static DECLFW(M293Write2) { static DECLFW(M293Write2) {
if (A < 0xA000) regs[1] = V; regs[1] = V;
Sync();
}
static DECLFW(M293Write3) {
regs[0] = V; regs[0] = V;
Sync(); Sync();
} }
static void M293Power(void) { static void M293Power(void) {
regs[0] = regs[1] = 0; regs[0] = regs[1] = 0;
Sync(); Sync();
SetReadHandler(0x8000, 0xFFFF, CartBR); SetReadHandler(0x8000, 0xFFFF, CartBR);
SetWriteHandler(0x8000, 0xBFFF, M293Write1); SetWriteHandler(0x8000, 0x9FFF, M293Write1);
SetWriteHandler(0xC000, 0xDFFF, M293Write2); SetWriteHandler(0xA000, 0xBFFF, M293Write2);
SetWriteHandler(0xC000, 0xDFFF, M293Write3);
} }
static void StateRestore(int version) { static void StateRestore(int version) {