X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxmem.h;h=36b469369d92ddc9c1e7370d84c04498507a7e5f;hb=87cc59de47301ff0a2e71b5ece28447ec77b0153;hp=b4096034efbd79b43e8ac74fa8d00a8c4c263c2a;hpb=654e8cfb205bebc40b26761a900db354b4920931;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxmem.h b/libpcsxcore/psxmem.h index b4096034..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,20 +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) { \ - s32 c_ = c; \ - u32 abs_ = psxRegs.cycle + c_; \ - s32 odi_ = next_interupt - psxRegs.cycle; \ - event_cycles[e] = abs_; \ - if (c_ < odi_) { \ - /*printf("%u: next_interupt %d -> %d (%u)\n", psxRegs.cycle, odi_, c_, abs_);*/ \ - next_interupt = abs_; \ - } \ -} - #ifdef __cplusplus } #endif