X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fr3000a.h;h=a8f39abb33781c7dc12493d4c1ebb9f8329318f1;hb=3faf5c235830d46b111bfc6459f50071b43f6a0d;hp=912a41f6d22d90ebcbc7b6112e772c501bd32301;hpb=14b3bd95c0a1304fb6de3c34b9d4dbfc065ce7fb;p=pcsx_rearmed.git diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index 912a41f6..a8f39abb 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -25,9 +25,6 @@ extern "C" { #endif #include "psxcommon.h" -#include "psxmem.h" -#include "psxcounters.h" -#include "psxbios.h" enum R3000Aexception { R3000E_Int = 0, // Interrupt @@ -45,7 +42,7 @@ enum R3000Aexception { enum R3000Anote { R3000ACPU_NOTIFY_CACHE_ISOLATED = 0, R3000ACPU_NOTIFY_CACHE_UNISOLATED = 1, - R3000ACPU_NOTIFY_BEFORE_SAVE, + R3000ACPU_NOTIFY_BEFORE_SAVE, // data arg - hle if non-null R3000ACPU_NOTIFY_AFTER_LOAD, }; @@ -180,7 +177,7 @@ enum { PSXINT_NEWDRC_CHECK, PSXINT_RCNT, PSXINT_CDRLID, - PSXINT_CDRPLAY_OLD, /* unused */ + PSXINT_IRQ10, PSXINT_SPU_UPDATE, PSXINT_COUNT }; @@ -224,6 +221,8 @@ typedef struct { u8 dloadSel; /* interp. delay load state */ u8 dloadReg[2]; u32 dloadVal[2]; + u32 biosBranchCheck; + u32 reserved[3]; // warning: changing anything in psxRegisters requires update of all // asm in libpcsxcore/new_dynarec/ } psxRegisters; @@ -257,6 +256,9 @@ void psxBranchTest(); void psxExecuteBios(); void psxJumpTest(); +void irq10Interrupt(); +void psxScheduleIrq10(int irq_count, int x_cycles, int y); + #ifdef __cplusplus } #endif