X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fr3000a.h;h=cb72bf362f147b4fcc9af8c9149adb4cc9ef2f50;hb=2330734fa3064bf3a159c3c56f9a2e005598360e;hp=54359159e20cfb36771c2b933f0869e8e9cca93a;hpb=81dbbf4cbb16fc6c9a82a5b91e102c8005c5726a;p=pcsx_rearmed.git diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index 54359159..cb72bf36 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -29,14 +29,11 @@ extern "C" { #include "psxcounters.h" #include "psxbios.h" -#ifdef ICACHE_EMULATION enum { R3000ACPU_NOTIFY_CACHE_ISOLATED = 0, R3000ACPU_NOTIFY_CACHE_UNISOLATED = 1, R3000ACPU_NOTIFY_DMA3_EXE_LOAD = 2 }; -extern uint32_t *Read_ICache(uint32_t pc); -#endif typedef struct { int (*Init)(); @@ -44,9 +41,8 @@ typedef struct { void (*Execute)(); /* executes up to a break */ void (*ExecuteBlock)(); /* executes up to a jump */ void (*Clear)(u32 Addr, u32 Size); -#ifdef ICACHE_EMULATION void (*Notify)(int note, void *data); -#endif + void (*ApplyConfig)(); void (*Shutdown)(); } R3000Acpu; @@ -194,9 +190,10 @@ typedef struct { u32 interrupt; struct { u32 sCycle, cycle; } intCycle[32]; u32 gteBusyCycle; + u32 muldivBusyCycle; // warning: changing anything in psxRegisters requires update of all // asm in libpcsxcore/new_dynarec/, but this member can be replaced - u32 reserved[3]; + u32 reserved[2]; } psxRegisters; extern psxRegisters psxRegs;