Rename include file

This commit is contained in:
twinaphex 2020-10-06 15:53:09 +02:00
parent 8cfd8df508
commit 9511d85176
2 changed files with 16 additions and 30 deletions

View File

@ -94,16 +94,7 @@ struct HuC6280 HuCPU;
#define FixPC_PC()
#endif
//#define IncPC() { HU_PC++; if(!(GetRealPC() & 0x1FFF)) printf("Bank crossing: %04x\n", GetRealPC()); }
//#define IncPC() HU_PC++;
#if 0
#define IncPC() { HU_PC++; if(!(GetRealPC() & 0x1FFF) && \
HuCPU.MPR[(GetRealPC() - 1) >> 13] != (HuCPU.MPR[(GetRealPC()) >> 13] - 1)) \
printf("Bank crossing: %04x, %02x, %02x\n", GetRealPC(), HuCPU.MPR[(GetRealPC() - 1) >> 13], \
HuCPU.MPR[GetRealPC() >> 13]); }
#else
#define IncPC() HU_PC++;
#endif
#ifdef HUC6280_CRAZY_VERSION
#define RdAtPC() (*(uint8*)HU_PC)
@ -698,7 +689,7 @@ void HuC6280_Run(int32 cycles)
switch(b1)
{
#include "huc6280_ops.inc"
#include "huc6280_ops.h"
}
#ifndef HUC6280_EXTRA_CRAZY

View File

@ -21,43 +21,41 @@
#define TEST_WEIRD_TFLAG(n) { /* if(HU_P & T_FLAG) puts("RAWR" n); */}
case 0x00: /* BRK */
IncPC();
IncPC();
HU_P &= ~T_FLAG;
PUSH_PC();
COMPRESS_FLAGS();
PUSH(HU_P|B_FLAG);
COMPRESS_FLAGS();
PUSH(HU_P|B_FLAG);
HU_P|=I_FLAG;
HU_P &= ~D_FLAG;
HU_PI|=I_FLAG;
{
unsigned int npc;
npc=RdOp(0xFFF6);
npc|=RdOp(0xFFF7)<<8;
unsigned int npc = RdOp(0xFFF6);
npc|=RdOp(0xFFF7)<<8;
SetPC(npc);
}
break;
break;
case 0x40: /* RTI */
HU_P = POP();
EXPAND_FLAGS();
HU_P = POP();
EXPAND_FLAGS();
/* HU_PI=HU_P; This is probably incorrect, so it's commented out. */
HU_PI = HU_P;
POP_PC();
// T-flag handling here:
TEST_WEIRD_TFLAG("RTI");
break;
break;
case 0x60: /* RTS */
POP_PC_AP();
break;
break;
case 0x48: /* PHA */
PUSH(HU_A);
break;
PUSH(HU_A);
break;
case 0x08: /* PHP */
HU_P &= ~T_FLAG;
@ -139,9 +137,7 @@ case 0x7C: // JMP Indirect X - 65C02
case 0x20: /* JSR */
{
unsigned int npc;
npc = RdAtPC();
unsigned int npc = RdAtPC();
IncPC();
PUSH_PC();
@ -618,12 +614,11 @@ case 0xF4: /* SET */
HU_Page1[HU_X] /*PAGE1_W[HU_X]*/ = HU_A;
HU_A = Abackup;
}
break;
break;
case 0xFC:
{
int32 ec_tmp;
ec_tmp = next_event - HuCPU.timestamp;
int32 ec_tmp = next_event - HuCPU.timestamp;
if(ec_tmp > 0)
{
ADDCYC(ec_tmp);