X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.h;h=36b469369d92ddc9c1e7370d84c04498507a7e5f;hb=87cc59de47301ff0a2e71b5ece28447ec77b0153;hp=222e6fbff213d41fce900b28ca61f9d14e710fb2;hpb=ae602c19f527fbc1f44cdb744cf824d04b8eceb1;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h index 222e6fbf..36b46936 100644 --- a/libpcsxcore/psxmem.h +++ b/libpcsxcore/psxmem.h @@ -122,9 +122,11 @@ extern u8 **psxMemRLUT; #define PSXMu32ref(mem) (*(u32 *)PSXM(mem)) -#if !defined(PSXREC) && (defined(__x86_64__) || defined(__i386__) || defined(__ppc__)) && !defined(NOPSXREC) +#ifndef PSXREC +#if defined(NEW_DYNAREC) || defined(LIGHTREC) #define PSXREC #endif +#endif int psxMemInit(); void psxMemReset(); @@ -138,19 +140,6 @@ void psxMemWrite16(u32 mem, u16 value); void psxMemWrite32(u32 mem, u32 value); void *psxMemPointer(u32 mem); -extern u32 event_cycles[6]; -extern u32 next_interupt; - -#define new_dyna_set_event(e, c) { \ - u32 c_ = c; \ - event_cycles[e] = c_; \ - if (c_ < next_interupt) { \ - /*printf("%u: next_interupt %d -> %d\n", psxRegs.cycle, \ - next_interupt - psxRegs.cycle, c_ - psxRegs.cycle);*/ \ - next_interupt = c_; \ - } \ -} - #ifdef __cplusplus } #endif