From 28bd1fcb797ea86e92eea358c124eede6bdf62c0 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Tue, 7 Sep 2010 00:55:05 +0000 Subject: ported the change in r56828 to dynarec (is the check in psxBASIC() really necessary?), removed powerpc dynarec (cannot test and likely broken). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56896 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- libpcsxcore/r3000a.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'libpcsxcore/r3000a.h') diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index f0b4e369..19363afe 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -40,7 +40,7 @@ typedef struct { extern R3000Acpu *psxCpu; extern R3000Acpu psxInt; -#if (defined(__x86_64__) || defined(__i386__) || defined(__sh__) || defined(__ppc__)) && !defined(NOPSXREC) +#if (defined(__x86_64__) || defined(__i386__)) && !defined(NOPSXREC) extern R3000Acpu psxRec; #define PSXREC #endif @@ -70,19 +70,19 @@ typedef union { PAIR p[34]; } psxGPRRegs; -typedef union { - struct { - u32 Index, Random, EntryLo0, BPC, - Context, BDA, PIDMask, DCIC, - BadVAddr, BDAM, EntryHi, BPCM, - Status, Cause, EPC, PRid, - Config, LLAddr, WatchLO, WatchHI, - XContext, Reserved1, Reserved2, Reserved3, - Reserved4, Reserved5, ECC, CacheErr, - TagLo, TagHi, ErrorEPC, Reserved6; - } n; - u32 r[32]; -} psxCP0Regs; +typedef union { + struct { + u32 Index, Random, EntryLo0, BPC, + Context, BDA, PIDMask, DCIC, + BadVAddr, BDAM, EntryHi, BPCM, + Status, Cause, EPC, PRid, + Config, LLAddr, WatchLO, WatchHI, + XContext, Reserved1, Reserved2, Reserved3, + Reserved4, Reserved5, ECC, CacheErr, + TagLo, TagHi, ErrorEPC, Reserved6; + } n; + u32 r[32]; +} psxCP0Regs; typedef struct { short x, y; @@ -152,8 +152,8 @@ enum { PSXINT_MDECOUTDMA, PSXINT_SPUDMA, PSXINT_GPUBUSY, - PSXINT_MDECINDMA, - PSXINT_GPUOTCDMA + PSXINT_MDECINDMA, + PSXINT_GPUOTCDMA }; typedef struct { @@ -166,9 +166,9 @@ typedef struct { u32 cycle; u32 interrupt; struct { u32 sCycle, cycle; } intCycle[32]; - u8 ICache_Addr[0x1000]; - u8 ICache_Code[0x1000]; - u32 ICache_valid; + u8 ICache_Addr[0x1000]; + u8 ICache_Code[0x1000]; + u32 ICache_valid; } psxRegisters; extern psxRegisters psxRegs; -- cgit v1.2.3