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

[ChannelFHawk] Some code tidy

This commit is contained in:
Asnivor 2024-10-24 13:49:27 +01:00
parent 9c322f8967
commit b3426624f7
6 changed files with 10 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Execute.cs
View File

@ -31,9 +31,6 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
public void FetchInstruction()
{
//dLog[opcode] = dLog[opcode] + 1;
//UpdateDebug();
switch (opcode)
{
case 0x00: LR_A_KU(); break; // LR A, (KU)

1
src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Operations.cs
View File

@ -217,7 +217,6 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
Regs[ALU0] = twosComp;
Regs[ALU1] = Regs[DB];
ADD_Func(ALU0, ALU1, ONE);
//ADD_Func(ALU0, ALU1);
}
/// <summary>

4
src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Registers.cs
View File

@ -349,10 +349,6 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
Regs[ONE] = 1;
Regs[ZERO] = 0;
Regs[BYTE] = 0xFF;
// testing only - fill scratchpad with 0xff
//for (int i = 0; i < 64; i++)
//Regs[i] = 0xff;
}
}
}

18
src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Tables.cs
View File

@ -252,8 +252,8 @@
{
PopulateCURINSTR(
// L
OP_LR8, DB, Ql, // DB <- (r15)
//OP_EI, // Set ICB Flag
OP_LR8, DB, Ql, // DB <- (r15)
//OP_EI, // Set ICB Flag
IDLE,
IDLE,
ROMC_17, // PC0l <- (DB)
@ -751,7 +751,7 @@
ROMC_03_L, // DB <- ((PC0)); PC0++
IDLE,
IDLE,
OP_CI, // Set flags for A <- (DB) + (-A) + 1 (do not store result in A)
OP_CI, // Set flags for A <- (DB) + (-A) + 1 (do not store result in A)
IDLE,
IDLE,
// S
@ -1451,7 +1451,7 @@
ROMC_1C_S, // Idle
OP_IN, ALU0, IO, // A <- ((Port index - 0/1))
IDLE,
OP_LR_A_DB_IO, A, ALU0, // A <- (A) - flags set as result of IN or INS operation
OP_LR_A_DB_IO, A, ALU0, // A <- (A) - flags set as result of IN or INS operation
// S
ROMC_00_S, // DB <- ((PC0)); PC0++
IDLE,
@ -1507,7 +1507,7 @@
// S
ROMC_1C_S, // Idle
IDLE,
OP_OUT, IO, A, // Port <- (A)
OP_OUT, IO, A, // Port <- (A)
IDLE,
// S
ROMC_00_S, // DB <- ((PC0)); PC0++
@ -1878,13 +1878,13 @@
PopulateCURINSTR(
// L
IDLE,
ROMC_01, // PC0 <- PC0 + (DB)
ROMC_01, // PC0 <- PC0 + (DB)
IDLE,
IDLE,
IDLE,
IDLE,
// S
ROMC_00_S, // DB <- ((PC0)); PC0++
ROMC_00_S, // DB <- ((PC0)); PC0++
IDLE,
IDLE,
END);
@ -1899,11 +1899,11 @@
PopulateCURINSTR(
// S
IDLE,
ROMC_03_S, // Immediate operand fetch
ROMC_03_S, // Immediate operand fetch
IDLE,
IDLE,
// S
ROMC_00_S, // DB <- ((PC0)); PC0++
ROMC_00_S, // DB <- ((PC0)); PC0++
IDLE,
IDLE,
END);

199
src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.cs
View File

@ -295,12 +295,6 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
DO_BRANCH(1);
else
DONT_BRANCH(1);
/*
if Regs[ISAR] & 7) == 7)
DONT_BRANCH(1);
else
DO_BRANCH(1);
*/
break;
// Branch on FALSE
@ -310,198 +304,7 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
else
DO_BRANCH(0);
break;
/*
// Unconditional Branch (relative)
case OP_BR:
DO_BF_BRANCH(0);
break;
// Branch on Negative
case OP_BM:
if (!FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch if no carry
case OP_BNC:
if (!FlagC)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch if negative and no carry
case OP_BF_CS:
if (!FlagS && !FlagC)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch if not zero
case OP_BNZ:
instr_pntr = 0;
if (!FlagZ)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on Negative and not Zero (same thing as branch on negative)
case OP_BF_ZS:
if (!FlagS && !FlagZ)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no Carry and not Zero
case OP_BF_ZC:
if (!FlagC && !FlagZ)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no Carry and not Zero and Negative
case OP_BF_ZCS:
if (!FlagC && !FlagZ && !FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no Overflow
case OP_BNO:
if (!FlagO)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and Negative
case OP_BF_OS:
if (!FlagO && !FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and Negative
case OP_BF_OC:
if (!FlagO && !FlagC)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and no carry and Negative
case OP_BF_OCS:
if (!FlagO && !FlagC && !FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and not zero
case OP_BF_OZ:
if (!FlagO && !FlagZ)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and not zero and negative
case OP_BF_OZS:
if (!FlagO && !FlagZ && !FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and not zero and no carry
case OP_BF_OZC:
if (!FlagO && !FlagZ && !FlagC)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
// Branch on no overflow and not zero and no carry and negative
case OP_BF_OZCS:
if (!FlagO && !FlagZ && !FlagC && FlagS)
DO_BF_BRANCH(0);
else
DONT_BF_BRANCH(0);
break;
*/
/*
// Branch on true - no branch
case OP_BTN:
DONT_BT_BRANCH(0);
break;
// Branch if positive
case OP_BP:
if (FlagS)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch on carry
case OP_BC:
if (FlagC)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch on carry or positive
case OP_BT_CS:
if (FlagC || FlagS)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch if zero
case OP_BZ:
if (FlagZ)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch if zero or positive
case OP_BT_ZS:
if (FlagZ || FlagS)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch if zero or carry
case OP_BT_ZC:
if (FlagZ || FlagC)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
// Branch if zero or carry or positive
case OP_BT_ZCS:
if (FlagZ || FlagC || FlagS)
DO_BT_BRANCH(0);
else
DONT_BT_BRANCH(0);
break;
*/
// A <- (I/O Port 0 or 1)
case OP_IN:
IN_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);

1
src/BizHawk.Emulation.Cores/Consoles/Fairchild/ChannelF/Ports.cs
View File

@ -125,7 +125,6 @@ namespace BizHawk.Emulation.Cores.Consoles.ChannelF
case 5:
_outputLatch[addr] = value;
_latchY = (value | 0xC0) ^ 0xFF;
//var audio = ((value ^ 0xFF) >> 6) & 0x03;
var audio = (value >> 6) & 0x03;
if (audio != _tone)
{