X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.h;h=ec307fc4a604f1db48f2e7ce2d9f6a0156eb19bb;hp=494ca7eff45d539a0adad4349ae872723312dc30;hb=HEAD;hpb=01d267961e8e7a20812dba544c643d4517d6a23b diff --git a/libpcsxcore/new_dynarec/emu_if.h b/libpcsxcore/new_dynarec/emu_if.h index 494ca7ef..ec307fc4 100644 --- a/libpcsxcore/new_dynarec/emu_if.h +++ b/libpcsxcore/new_dynarec/emu_if.h @@ -1,27 +1,13 @@ #include "new_dynarec.h" #include "../r3000a.h" -extern char invalid_code[0x100000]; - -/* weird stuff */ -#define EAX 0 -#define ECX 1 - -/* same as psxRegs */ -extern int reg[]; +extern int dynarec_local[]; /* same as psxRegs.GPR.n.* */ 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 { @@ -53,13 +39,9 @@ extern int reg_cop2d[], reg_cop2c[]; extern void *gte_handlers[64]; extern void *gte_handlers_nf[64]; extern const char *gte_regnames[64]; -extern const char gte_cycletab[64]; extern const uint64_t gte_reg_reads[64]; extern const uint64_t gte_reg_writes[64]; -/* dummy */ -extern int FCR0, FCR31; - /* mem */ extern void *mem_rtab; extern void *mem_wtab; @@ -73,14 +55,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; @@ -90,7 +73,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 */ @@ -100,8 +83,3 @@ 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