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

MSXHawk: some cleanup

This commit is contained in:
alyosha-tas 2020-01-20 17:52:35 -05:00
parent 1c2453088f
commit 3efa95df51
2 changed files with 31 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libHawk/MSXHawk/MSXHawk/Memory.h
View File

@ -68,8 +68,8 @@ namespace MSXHawk
// default memory map setup
reg_FFFC = 0;
reg_FFFD = 0;
reg_FFFE = 0;
reg_FFFF = 0;
reg_FFFE = 1;
reg_FFFF = 2;
remap_ROM_0();
remap_ROM_1();
remap_ROM_2();

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

@ -84,7 +84,7 @@ namespace MSXHawk
// non-state variables
bool checker;
uint32_t Ztemp1, Ztemp2, Ztemp3, Ztemp4;
uint32_t Reg16_d, Reg16_s, ans, temp, carry, dest_t, src_t;
uint32_t Reg16_d, Reg16_s, ans, temp, carry;
uint32_t cur_instr[38] = {}; // only used for building
uint32_t BUSRQ[19] = {}; // only used for building
uint32_t MEMRQ[19] = {}; // only used for building
@ -667,7 +667,7 @@ namespace MSXHawk
CP8_Func(cur_instr_ofst[instr_pntr + 1], cur_instr_ofst[instr_pntr + 2]);
break;
case TR:
TR_Func(cur_instr_ofst[instr_pntr + 1], cur_instr_ofst[instr_pntr + 2]);
Regs[cur_instr_ofst[instr_pntr + 1]] = Regs[cur_instr_ofst[instr_pntr + 2]];
break;
}
instr_pntr += 3;
@ -690,11 +690,12 @@ namespace MSXHawk
Regs[W] = Regs[A];
break;
case TR:
TR_Func(cur_instr_ofst[instr_pntr], cur_instr_ofst[instr_pntr + 1]);
Regs[cur_instr_ofst[instr_pntr]] = Regs[cur_instr_ofst[instr_pntr + 1]];
instr_pntr += 2;
break;
case TR16:
TR16_Func(cur_instr_ofst[instr_pntr], cur_instr_ofst[instr_pntr + 1], cur_instr_ofst[instr_pntr + 2], cur_instr_ofst[instr_pntr + 3]);
Regs[cur_instr_ofst[instr_pntr]] = Regs[cur_instr_ofst[instr_pntr + 2]];
Regs[cur_instr_ofst[instr_pntr + 1]] = Regs[cur_instr_ofst[instr_pntr + 3]];
instr_pntr += 4;
break;
case ADD16:
@ -814,11 +815,11 @@ namespace MSXHawk
instr_pntr += 2;
break;
case RES:
RES_Func(cur_instr_ofst[instr_pntr], cur_instr_ofst[instr_pntr + 1]);
Regs[cur_instr_ofst[instr_pntr + 1]] &= (uint32_t)(0xFF - (1 << cur_instr_ofst[instr_pntr]));
instr_pntr += 2;
break;
case SET:
SET_Func(cur_instr_ofst[instr_pntr], cur_instr_ofst[instr_pntr + 1]);
Regs[cur_instr_ofst[instr_pntr + 1]] |= (uint32_t)(1 << cur_instr_ofst[instr_pntr]);
instr_pntr += 2;
break;
case EI:
@ -840,8 +841,6 @@ namespace MSXHawk
instr_pntr += 4;
break;
case PREFIX:
src_t = PRE_SRC;
NO_prefix = false;
if (PRE_SRC == CBpre) { CB_prefix = true; }
if (PRE_SRC == EXTDpre) { EXTD_prefix = true; }
@ -869,7 +868,7 @@ namespace MSXHawk
I_skip = true;
break;
case ASGN:
ASGN_Func(cur_instr_ofst[instr_pntr], cur_instr_ofst[instr_pntr + 1]);
Regs[cur_instr_ofst[instr_pntr]] = cur_instr_ofst[instr_pntr + 1];
instr_pntr += 2;
break;
case ADDS:
@ -974,9 +973,9 @@ namespace MSXHawk
}
break;
case SET_FL_IR:
dest_t = cur_instr_ofst[instr_pntr++];
TR_Func(dest_t, cur_instr_ofst[instr_pntr++]);
SET_FL_IR_Func(dest_t);
Regs[cur_instr_ofst[instr_pntr]] = Regs[cur_instr_ofst[instr_pntr + 1]];
SET_FL_IR_Func(cur_instr_ofst[instr_pntr]);
instr_pntr += 2;
break;
case FTCH_DB:
FTCH_DB_Func();
@ -999,7 +998,8 @@ namespace MSXHawk
Ztemp4 = cur_instr_ofst[instr_pntr++];
if (Ztemp4 == DEC16)
{
TR16_Func(Z, W, C, B);
Regs[Z] = Regs[C];
Regs[W] = Regs[B];
DEC16_Func(Z, W);
DEC8_Func(B);
@ -1012,7 +1012,8 @@ namespace MSXHawk
}
else
{
TR16_Func(Z, W, C, B);
Regs[Z] = Regs[C];
Regs[W] = Regs[B];
INC16_Func(Z, W);
DEC8_Func(B);
@ -1056,14 +1057,16 @@ namespace MSXHawk
{
DEC16_Func(L, H);
DEC8_Func(B);
TR16_Func(Z, W, C, B);
Regs[Z] = Regs[C];
Regs[W] = Regs[B];
DEC16_Func(Z, W);
}
else
{
INC16_Func(L, H);
DEC8_Func(B);
TR16_Func(Z, W, C, B);
Regs[Z] = Regs[C];
Regs[W] = Regs[B];
INC16_Func(Z, W);
}
@ -1172,30 +1175,11 @@ namespace MSXHawk
}
else
{
// 0 = DJNZ, 1 = JR COND, 2 = JP COND, 3 = RET COND, 4 = CALL
cond_chk_fail = true;
switch (cur_instr_ofst[instr_pntr++])
{
case 0: // DJNZ
cur_irqs_ofst = &False_IRQS[0];
IRQS_cond_offset = 0;
break;
case 1: // JR COND
cur_irqs_ofst = &False_IRQS[1];
IRQS_cond_offset = 1;
break;
case 2: // JP COND
cur_irqs_ofst = &False_IRQS[2];
IRQS_cond_offset = 2;
break;
case 3: // RET COND
cur_irqs_ofst = &False_IRQS[3];
IRQS_cond_offset = 3;
break;
case 4: // CALL
cur_irqs_ofst = &False_IRQS[4];
IRQS_cond_offset = 4;
break;
}
cur_irqs_ofst = &False_IRQS[cur_instr_ofst[instr_pntr]];
IRQS_cond_offset = cur_instr_ofst[instr_pntr];
instr_pntr++;
}
jp_cond_chk = checker;
@ -3882,7 +3866,9 @@ namespace MSXHawk
Regs[DB] = Regs[dest_h];
INC16_Func(src_l, src_h);
TR16_Func(PCl, PCh, dest_l, dest_h);
Regs[PCl] = Regs[dest_l];
Regs[PCh] = Regs[dest_h];
}
void Write_Func(uint32_t dest_l, uint32_t dest_h, uint32_t src)
@ -3936,7 +3922,8 @@ namespace MSXHawk
Memory_Write((uint32_t)(Regs[dest_l] | (Regs[dest_h] << 8)), (uint8_t)(Regs[src] & 0xFF));
TR16_Func(PCl, PCh, Z, W);
Regs[PCl] = Regs[Z];
Regs[PCh] = Regs[W];
}
void OUT_Func(uint32_t dest_l, uint32_t dest_h, uint32_t src)
@ -3989,17 +3976,6 @@ namespace MSXHawk
INC16_Func(src_l, src_h);
}
void TR_Func(uint32_t dest, uint32_t src)
{
Regs[dest] = Regs[src];
}
void TR16_Func(uint32_t dest_l, uint32_t dest_h, uint32_t src_l, uint32_t src_h)
{
Regs[dest_l] = Regs[src_l];
Regs[dest_h] = Regs[src_h];
}
void ADD16_Func(uint32_t dest_l, uint32_t dest_h, uint32_t src_l, uint32_t src_h)
{
Reg16_d = Regs[dest_l] | (Regs[dest_h] << 8);
@ -4089,21 +4065,6 @@ namespace MSXHawk
Flag3set((Regs[W] & 0x08) > 0);
}
void SET_Func(uint32_t bit, uint32_t src)
{
Regs[src] |= (uint32_t)(1 << bit);
}
void RES_Func(uint32_t bit, uint32_t src)
{
Regs[src] &= (uint32_t)(0xFF - (1 << bit));
}
void ASGN_Func(uint32_t src, uint32_t val)
{
Regs[src] = val;
}
void SLL_Func(uint32_t src)
{
FlagCset((Regs[src] & 0x80) > 0);