X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.h;h=b49b84bada81b710eb38320d6cbf749bf448bbe1;hb=d75460620efa21df695967c72a92265dac04001f;hp=36cc275fddd7c086e5439efd71d6f4cef16f3576;hpb=81dbbf4cbb16fc6c9a82a5b91e102c8005c5726a;p=pcsx_rearmed.git diff --git a/libpcsxcore/new_dynarec/emu_if.h b/libpcsxcore/new_dynarec/emu_if.h index 36cc275f..b49b84ba 100644 --- a/libpcsxcore/new_dynarec/emu_if.h +++ b/libpcsxcore/new_dynarec/emu_if.h @@ -14,13 +14,6 @@ extern int hi, lo; /* same as psxRegs.CP0.n.* */ extern int reg_cop0[]; -#define Status psxRegs.CP0.n.Status -#define Cause psxRegs.CP0.n.Cause -#define EPC psxRegs.CP0.n.EPC -#define BadVAddr psxRegs.CP0.n.BadVAddr -#define Context psxRegs.CP0.n.Context -#define EntryHi psxRegs.CP0.n.EntryHi -#define Count psxRegs.cycle // psxRegs.CP0.n.Count /* COP2/GTE */ enum gte_opcodes { @@ -68,14 +61,15 @@ void jump_handler_write32(u32 addr, u32 data, u32 cycles, u32 *table); void jump_handler_write_h(u32 addr, u32 data, u32 cycles, void *handler); void jump_handle_swl(u32 addr, u32 data, u32 cycles); void jump_handle_swr(u32 addr, u32 data, u32 cycles); -void rcnt0_read_count_m0(u32 addr, u32, u32 cycles); -void rcnt0_read_count_m1(u32 addr, u32, u32 cycles); -void rcnt1_read_count_m0(u32 addr, u32, u32 cycles); -void rcnt1_read_count_m1(u32 addr, u32, u32 cycles); -void rcnt2_read_count_m0(u32 addr, u32, u32 cycles); -void rcnt2_read_count_m1(u32 addr, u32, u32 cycles); +u32 rcnt0_read_count_m0(u32 addr, u32, u32 cycles); +u32 rcnt0_read_count_m1(u32 addr, u32, u32 cycles); +u32 rcnt1_read_count_m0(u32 addr, u32, u32 cycles); +u32 rcnt1_read_count_m1(u32 addr, u32, u32 cycles); +u32 rcnt2_read_count_m0(u32 addr, u32, u32 cycles); +u32 rcnt2_read_count_m1(u32 addr, u32, u32 cycles); extern unsigned int address; +extern unsigned int hack_addr; extern void *psxH_ptr; extern void *zeromem_ptr; extern void *scratch_buf_ptr; @@ -85,7 +79,7 @@ extern void *scratch_buf_ptr; extern u32 inv_code_start, inv_code_end; /* cycles/irqs */ -extern unsigned int next_interupt; +extern u32 next_interupt; extern int pending_exception; /* called by drc */ @@ -95,8 +89,4 @@ void pcsx_mtc0_ds(u32 reg, u32 val); /* misc */ extern void SysPrintf(const char *fmt, ...); -#ifdef RAM_FIXED -#define rdram ((u_char *)0x80000000) -#else #define rdram ((u_char *)psxM) -#endif