X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=x6502.h;h=83adca0953f8a3cc51422694b86a6f270dab8827;hp=1a44b30ca7229240e339132fe6e929f68e1e79ae;hb=b2b95d2e0d1fd5e52d03c2152605b09b024c1d0e;hpb=4fdfab079f3f006ae215ab453072a25588aa951d diff --git a/x6502.h b/x6502.h index 1a44b30..83adca0 100644 --- a/x6502.h +++ b/x6502.h @@ -52,6 +52,8 @@ extern void FP_FASTAPASS(1) (*MapIRQHook)(int a); #define FCEU_IQDPCM 0x10 #define FCEU_IQFCOUNT 0x20 #define FCEU_IQTEMP 0x80 +// from 0.98.15 +#define FCEU_IQEXT2 0x02 #if defined(DEBUG_ASM_6502) #define TriggerIRQ TriggerIRQ_d @@ -64,7 +66,7 @@ extern void FP_FASTAPASS(1) (*MapIRQHook)(int a); #define X6502_IRQBegin X6502_IRQBegin_d #define X6502_IRQEnd X6502_IRQEnd_d #define X6502_Rebase X6502_Rebase_d -#define X6502_GetCycleCount() 0 +#define X6502_GetCycleCount() g_cnt #define X6502_C #define X6502_A #define X6502_D @@ -76,8 +78,10 @@ extern void FP_FASTAPASS(1) (*MapIRQHook)(int a); #define X6502_Reset X6502_Reset_a #define X6502_Power X6502_Power_a #define X6502_AddCycles X6502_AddCycles_a -#define X6502_IRQBegin X6502_IRQBegin_a -#define X6502_IRQEnd X6502_IRQEnd_a +//#define X6502_IRQBegin X6502_IRQBegin_a +//#define X6502_IRQEnd X6502_IRQEnd_a +#define X6502_IRQBegin(w) nes_registers[4]|=w<<8 +#define X6502_IRQEnd(w) nes_registers[4]&=~(w<<8) #define X6502_Rebase X6502_Rebase_a #define X6502_GetCycleCount() ((int32)nes_registers[7]>>16) #define X6502_A @@ -120,6 +124,7 @@ extern void FP_FASTAPASS(1) (*MapIRQHook)(int a); // c #ifdef X6502_C +extern int32 g_cnt; void TriggerIRQ_c(void); void TriggerNMI_c(void); void TriggerNMINSF_c(void);