X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.h;h=3f4aba6fef21f005ee1e2810dff5585bb762e06a;hb=ed7afeef12576ad228f138bd7d7acd7f390dd25a;hp=db11f7b2531ef92c833d88ee24296a3569418460;hpb=7f94b097581d5833921f6db86f18c7ef1203aa62;p=pcsx_rearmed.git diff --git a/libpcsxcore/new_dynarec/emu_if.h b/libpcsxcore/new_dynarec/emu_if.h index db11f7b2..3f4aba6f 100644 --- a/libpcsxcore/new_dynarec/emu_if.h +++ b/libpcsxcore/new_dynarec/emu_if.h @@ -1,12 +1,6 @@ #include "new_dynarec.h" #include "../r3000a.h" -extern char invalid_code[0x100000]; - -/* weird stuff */ -#define EAX 0 -#define ECX 1 - extern int dynarec_local[]; /* same as psxRegs.GPR.n.* */ @@ -14,13 +8,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,12 +55,12 @@ 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;