ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MSXHawk: minor cleanup

This commit is contained in:
alyosha-tas 2020-01-20 19:50:32 -05:00
parent 3efa95df51
commit 679efd91c4
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Computers/MSX/MSX.IStatable.cs
View File

@ -60,13 +60,11 @@ namespace BizHawk.Emulation.Cores.Computers.MSX
{ {
ser.Sync(nameof(MSX_core), ref MSX_core, false); ser.Sync(nameof(MSX_core), ref MSX_core, false);
LibMSX.MSX_load_state(MSX_Pntr, MSX_core); LibMSX.MSX_load_state(MSX_Pntr, MSX_core);
Console.WriteLine("here1");
} }
else else
{ {
LibMSX.MSX_save_state(MSX_Pntr, MSX_core); LibMSX.MSX_save_state(MSX_Pntr, MSX_core);
ser.Sync(nameof(MSX_core), ref MSX_core, false); ser.Sync(nameof(MSX_core), ref MSX_core, false);
Console.WriteLine("here2");
} }
} }
} }

37
libHawk/MSXHawk/MSXHawk/Z80A.h
View File

@ -343,14 +343,14 @@ namespace MSXHawk
uint32_t REP_OP_O_IRQS = 5; uint32_t REP_OP_O_IRQS = 5;
// halt // halt
uint32_t HALT_INST[4] = { IDLE, uint32_t NO_HALT_INST[4] = { IDLE,
WAIT, WAIT,
OP_F, OP_F,
OP }; OP };
uint32_t HALT_BUSRQ[4] = { PCh, 0, 0, 0 }; uint32_t NO_HALT_BUSRQ[4] = { PCh, 0, 0, 0 };
uint32_t HALT_MEMRQ[4] = { PCh, 0, 0, 0 }; uint32_t NO_HALT_MEMRQ[4] = { PCh, 0, 0, 0 };
uint32_t HALT_IRQS = 4; uint32_t NO_HALT_IRQS = 4;
// NMI // NMI
uint32_t NMI_INST[25] = { IDLE, uint32_t NMI_INST[25] = { IDLE,
@ -596,10 +596,10 @@ namespace MSXHawk
if (TraceCallback) { TraceCallback(0); } if (TraceCallback) { TraceCallback(0); }
bank_num = bank_offset = RegPCget(); bank_num = bank_offset = RegPCget();
RegPCset(bank_num + 1);
bank_offset &= low_mask; bank_offset &= low_mask;
bank_num = (bank_num >> bank_shift)& high_mask; bank_num = (bank_num >> bank_shift)& high_mask;
opcode = MemoryMap[bank_num][bank_offset]; opcode = MemoryMap[bank_num][bank_offset];
RegPCset(RegPCget() + 1);
FetchInstruction(); FetchInstruction();
temp_R = (Regs[R] & 0x7F); temp_R = (Regs[R] & 0x7F);
@ -859,11 +859,12 @@ namespace MSXHawk
} }
bank_num = bank_offset = RegPCget(); bank_num = bank_offset = RegPCget();
RegPCset(bank_num + 1);
bank_offset &= low_mask; bank_offset &= low_mask;
bank_num = (bank_num >> bank_shift)& high_mask; bank_num = (bank_num >> bank_shift)& high_mask;
opcode = MemoryMap[bank_num][bank_offset]; opcode = MemoryMap[bank_num][bank_offset];
RegPCset(RegPCget() + 1);
FetchInstruction(); FetchInstruction();
instr_pntr = bus_pntr = mem_pntr = irq_pntr = 0; instr_pntr = bus_pntr = mem_pntr = irq_pntr = 0;
I_skip = true; I_skip = true;
break; break;
@ -1255,10 +1256,10 @@ namespace MSXHawk
// otherwise start a new normal access // otherwise start a new normal access
else if (!halted) else if (!halted)
{ {
cur_instr_ofst = &HALT_INST[0]; cur_instr_ofst = &NO_HALT_INST[0];
cur_bus_ofst = &HALT_BUSRQ[0]; cur_bus_ofst = &NO_HALT_BUSRQ[0];
cur_mem_ofst = &HALT_MEMRQ[0]; cur_mem_ofst = &NO_HALT_MEMRQ[0];
cur_irqs_ofst = &HALT_IRQS; cur_irqs_ofst = &NO_HALT_IRQS;
instr_bank = 11; instr_bank = 11;
@ -5530,10 +5531,10 @@ namespace MSXHawk
} }
else if (instr_bank == 11) else if (instr_bank == 11)
{ {
cur_instr_ofst = &HALT_INST[0]; cur_instr_ofst = &NO_HALT_INST[0];
cur_bus_ofst = &HALT_BUSRQ[0]; cur_bus_ofst = &NO_HALT_BUSRQ[0];
cur_mem_ofst = &HALT_MEMRQ[0]; cur_mem_ofst = &NO_HALT_MEMRQ[0];
cur_irqs_ofst = &HALT_IRQS; cur_irqs_ofst = &NO_HALT_IRQS;
} }
else if (instr_bank == 12) else if (instr_bank == 12)
{ {