Rename X6502 X to cpu

libretro · Jan 24, 2024 · b918d42 · b918d42
1 parent 539af6b
commit b918d42
Show file tree

Hide file tree

Showing 36 changed files with 95 additions and 98 deletions.
diff --git a/src/cart.c b/src/cart.c
@@ -151,7 +151,7 @@ void CartBW(uint32 A, uint8 V) {
 
 uint8 CartBROB(uint32 A) {
 	if (!Page[A >> 11])
-		return(X.DB);
+		return(cpu.DB);
 	return Page[A >> 11][A];
 }
 

diff --git a/src/fceu.c b/src/fceu.c
@@ -61,7 +61,7 @@ static writefunc *BWriteG = NULL;
 static int RWWrap = 0;
 
 static void BNull(uint32 A, uint8 V) { }
-static uint8 ANull(uint32 A) { return(X.DB); }
+static uint8 ANull(uint32 A) { return(cpu.DB); }
 
 int AllocGenieRW(void)
 {

diff --git a/src/fds.c b/src/fds.c
@@ -324,8 +324,8 @@ static uint8 FDSRead4030(uint32 A) {
 	uint8 ret = 0;
 
 	/* Cheap hack. */
-	if (X.IRQlow & FCEU_IQEXT) ret |= 1;
-	if (X.IRQlow & FCEU_IQEXT2) ret |= 2;
+	if (cpu.IRQlow & FCEU_IQEXT) ret |= 1;
+	if (cpu.IRQlow & FCEU_IQEXT2) ret |= 2;
 
 	X6502_IRQEnd(FCEU_IQEXT);
 	X6502_IRQEnd(FCEU_IQEXT2);
@@ -370,9 +370,7 @@ static uint8 FDSRead4031(uint32 A) {
 }
 
 static uint8 FDSRead4032(uint32 A) {
-	uint8 ret;
-
-	ret = X.DB & ~7;
+	uint8 ret = cpu.DB & ~7;
 	if (InDisk == 255)
 		ret |= 5;
 

diff --git a/src/input.c b/src/input.c
@@ -85,7 +85,7 @@ static uint8 JPRead(uint32 A)
 		if (FCExp->Read)
 			ret = FCExp->Read(A & 1, ret);
 
-	ret |= X.DB & 0xC0;
+	ret |= cpu.DB & 0xC0;
 
 	return(ret);
 }

diff --git a/src/mappers/hw/bandai.c b/src/mappers/hw/bandai.c
@@ -302,8 +302,8 @@ static void BandaiWrite(uint32 A, uint8 V) {
 
 static uint8 BandaiRead(uint32 A) {
 	if (x24c02)
-		return (X.DB & 0xEF) | (x24c02_out << 4);
-	return (X.DB & 0xEF) | (x24c01_out << 4);
+		return (cpu.DB & 0xEF) | (x24c02_out << 4);
+	return (cpu.DB & 0xEF) | (x24c01_out << 4);
 }
 
 static void BandaiIRQHook(int a) {
@@ -607,7 +607,7 @@ static void BarcodeIRQHook(int a) {
 }
 
 static uint8 BarcodeRead(uint32 A) {
-	return (X.DB & 0xE7) | ((x24c02_out | x24c01_out) << 4) | BarcodeOut;
+	return (cpu.DB & 0xE7) | ((x24c02_out | x24c01_out) << 4) | BarcodeOut;
 }
 
 static void M157Power(void) {

diff --git a/src/mappers/hw/jyasic.c b/src/mappers/hw/jyasic.c
@@ -250,7 +250,7 @@ static void cpuCycle(int a)
 uint8 readALU_DIP(uint32 A)
 {
    if ((A &0x3FF) ==0 && A !=0x5800) /* 5000, 5400, 5C00: read solder pad setting */
-      return dipSwitch | X.DB &0x3F;
+      return dipSwitch | cpu.DB &0x3F;
 
    if (A &0x800)
       switch (A &3)
@@ -266,7 +266,7 @@ uint8 readALU_DIP(uint32 A)
             return test;
       }
    /* all others */
-   return X.DB;
+   return cpu.DB;
 }
 
 void writeALU(uint32 A, uint8 V)

diff --git a/src/mappers/hw/mmc1.c b/src/mappers/hw/mmc1.c
@@ -61,7 +61,7 @@ static void MBWRAM(uint32 A, uint8 V) {
 
 static uint8 MAWRAM(uint32 A) {
 	if (!MMC1WRAMEnabled() && !is155)
-		return X.DB;			/* WRAM is disabled */
+		return cpu.DB;			/* WRAM is disabled */
 	return(Page[A >> 11][A]);
 }
 

diff --git a/src/mappers/hw/mmc3.c b/src/mappers/hw/mmc3.c
@@ -482,7 +482,7 @@ static void M45CW(uint32 A, uint8 V) {
 }
 
 static uint8 M45ReadOB(uint32 A) {
-	return X.DB;
+	return cpu.DB;
 }
 
 static void M45PW(uint32 A, uint8 V) {
@@ -515,8 +515,8 @@ static void M45Write(uint32 A, uint8 V) {
 static uint8 M45Read(uint32 A) {
 	uint32 addr = 1 << (EXPREGS[5] + 4);
 	if (A & (addr | (addr - 1)))
-		return X.DB | 1;
-	return X.DB;
+		return cpu.DB | 1;
+	return cpu.DB;
 }
 
 static void M45Reset(void) {

diff --git a/src/mappers/hw/txc.c b/src/mappers/hw/txc.c
@@ -177,9 +177,9 @@ static void M36Write(uint32 A, uint8 V) {
 }
 
 static uint8 M36Read(uint32 A) {
-	uint8 ret = X.DB;
+	uint8 ret = cpu.DB;
 	if ((A & 0x103) == 0x100)
-	  ret = (X.DB & 0xCF) | ((TXC_CMDRead() << 4) & 0x30);
+	  ret = (cpu.DB & 0xCF) | ((TXC_CMDRead() << 4) & 0x30);
 	return ret;
 }
 
@@ -209,9 +209,9 @@ static void M132Write(uint32 A, uint8 V) {
 }
 
 static uint8 M132Read(uint32 A) {
-	uint8 ret = X.DB;
+	uint8 ret = cpu.DB;
 	if ((A & 0x103) == 0x100)
-	  ret = ((X.DB & 0xF0) | (TXC_CMDRead() & 0x0F));
+	  ret = ((cpu.DB & 0xF0) | (TXC_CMDRead() & 0x0F));
 	return ret;
 }
 
@@ -257,9 +257,9 @@ static void M136Write(uint32 A, uint8 V) {
 }
 
 static uint8 M136Read(uint32 A) {
-	uint8 ret = X.DB;
+	uint8 ret = cpu.DB;
 	if ((A & 0x103) == 0x100)
-	  ret = ((X.DB & 0xC0) | (TXC_CMDRead() & 0x3F));
+	  ret = ((cpu.DB & 0xC0) | (TXC_CMDRead() & 0x3F));
 	return ret;
 }
 
@@ -287,7 +287,7 @@ static void M147Write(uint32 A, uint8 V) {
 }
 
 static uint8 M147Read(uint32 A) {
-	uint8 ret = X.DB;
+	uint8 ret = cpu.DB;
 	if ((A & 0x103) == 0x100) {
 	  uint8 value = TXC_CMDRead();
 	  ret = ((value << 2) & 0xFC) | ((value >> 6) & 0x03);
@@ -323,9 +323,9 @@ static uint8 GetValue(uint8 value) {
 static void M172Write(uint32 A, uint8 V) { TXC_CMDWrite(A, GetValue(V)); }
 
 static uint8 M172Read(uint32 A) {
-	uint8 ret = X.DB;
+	uint8 ret = cpu.DB;
 	if ((A & 0x103) == 0x100)
-	  ret = (X.DB & 0xC0) | GetValue(TXC_CMDRead());
+	  ret = (cpu.DB & 0xC0) | GetValue(TXC_CMDRead());
 	return ret;
 }
 

diff --git a/src/mappers/mapper005.c b/src/mappers/mapper005.c
@@ -345,7 +345,7 @@ static void Mapper5_write(uint32 A, uint8 V) {
 static uint8 MMC5_ReadROMRAM(uint32 A) {
 	if (MMC5MemIn[(A - 0x6000) >> 13])
 		return Page[A >> 11][A];
-	return X.DB;
+	return cpu.DB;
 }
 
 static void MMC5_WriteROMRAM(uint32 A, uint8 V) {
@@ -377,7 +377,7 @@ static uint8 MMC5_read(uint32 A) {
 	case 0x5206:
 		return((mul[0] * mul[1]) >> 8);
 	}
-	return(X.DB);
+	return(cpu.DB);
 }
 
 void MMC5Synco(void) {

diff --git a/src/mappers/mapper063.c b/src/mappers/mapper063.c
@@ -38,7 +38,7 @@ static uint16 openBus;
 
 static uint8 M63Read(uint32 A) {
 	if (openBus)
-		return X.DB;
+		return cpu.DB;
 	return CartBR(A);
 }
 

diff --git a/src/mappers/mapper069.c b/src/mappers/mapper069.c
@@ -67,7 +67,7 @@ static void M69WRAMWrite(uint32 A, uint8 V) {
 
 static uint8 M69WRAMRead(uint32 A) {
 	if ((preg[3] & 0xC0) == 0x40)
-		return X.DB;
+		return cpu.DB;
 	return CartBR(A);
 }
 

diff --git a/src/mappers/mapper083.c b/src/mappers/mapper083.c
@@ -141,7 +141,7 @@ static void M83Write(uint32 A, uint8 V) {
 	}
 }
 
-static uint8 UNLYOKOReadDip(uint32 A) { return (X.DB & 0xFC) | dip; }
+static uint8 UNLYOKOReadDip(uint32 A) { return (cpu.DB & 0xFC) | dip; }
 static uint8 UNLYOKOReadLow(uint32 A) { return low[A & 3]; }
 static void UNLYOKOWriteLow(uint32 A, uint8 V) { low[A & 3] = V; }
 

diff --git a/src/mappers/mapper150.c b/src/mappers/mapper150.c
@@ -227,8 +227,8 @@ void SA0037_Init(CartInfo *info) {
 
 static uint8 TCA01Read(uint32 A) {
 	if ((A & 0x4100) == 0x4100)
-		return (X.DB & 0xC0) | ((~A) & 0x3F);
-	return X.DB;
+		return (cpu.DB & 0xC0) | ((~A) & 0x3F);
+	return cpu.DB;
 }
 
 static void TCA01Power(void) {
@@ -270,10 +270,10 @@ static void S74LS374NSynco(void) {
 static uint8 S74LS374NRead(uint32 A) {
 	if ((A & 0xC101) == 0x4101) {
 		if (dip & 1)
-			return (latch[cmd] & 3) | (X.DB & 0xFC);
-		return (latch[cmd] & 7) | (X.DB & 0xF8);
+			return (latch[cmd] & 3) | (cpu.DB & 0xFC);
+		return (latch[cmd] & 7) | (cpu.DB & 0xF8);
 	}
-	return X.DB;
+	return cpu.DB;
 }
 
 static void S74LS374NWrite(uint32 A, uint8 V) {

diff --git a/src/mappers/mapper170.c b/src/mappers/mapper170.c
@@ -35,7 +35,7 @@ static void Sync(void) {
 }
 
 static void M170ProtW(uint32 A, uint8 V) { reg = V << 1 & 0x80; }
-static uint8 M170ProtR(uint32 A) { return reg | (X.DB & 0x7F); }
+static uint8 M170ProtR(uint32 A) { return reg | (cpu.DB & 0x7F); }
 
 static void M170Power(void) {
 	Sync();

diff --git a/src/mappers/mapper178.c b/src/mappers/mapper178.c
@@ -115,8 +115,8 @@ static void M178WriteSnd(uint32 A, uint8 V) {
 
 static uint8 M178ReadSnd(uint32 A) {
 	if (A == 0x5800)
-		return (X.DB & 0xBF) | ((pcm_enable ^ 1) << 6);
-	return X.DB;
+		return (cpu.DB & 0xBF) | ((pcm_enable ^ 1) << 6);
+	return cpu.DB;
 }
 
 static void M178Power(void) {

diff --git a/src/mappers/mapper225.c b/src/mappers/mapper225.c
@@ -68,7 +68,7 @@ static void M225LoWrite(uint32 A, uint8 V) {
 
 static uint8 M225LoRead(uint32 A) {
 	if (A & 0x800) return extraRAM[A & 3];
-	return X.DB;
+	return cpu.DB;
 }
 
 static void M225Power(void) {

diff --git a/src/mappers/mapper235.c b/src/mappers/mapper235.c
@@ -62,7 +62,7 @@ static void Sync(void) {
 static uint8 M235Read(uint32 A) {
 	if (openbus) {
 		openbus = 0;
-		return X.DB;
+		return cpu.DB;
 	}
 	return CartBR(A);
 }

diff --git a/src/mappers/mapper257.c b/src/mappers/mapper257.c
@@ -75,7 +75,7 @@ static void UNLPEC586Write(uint32 A, uint8 V) {
 }
 
 static uint8 UNLPEC586Read(uint32 A) {
-	return (X.DB & 0xD8) | br_tbl[reg[4] >> 4];
+	return (cpu.DB & 0xD8) | br_tbl[reg[4] >> 4];
 }
 
 static uint8 UNLPEC586ReadHi(uint32 A) {

diff --git a/src/mappers/mapper268.c b/src/mappers/mapper268.c
@@ -86,7 +86,7 @@ static void Mapper268_CHRWrap(uint32 A, uint8 V) {
 }
 
 static uint8 Mapper268_ReadWRAM(uint32 A) {
-	return A001B &0xA0? CartBR(A): X.DB;
+	return A001B &0xA0? CartBR(A): cpu.DB;
 }
 
 static void Mapper268_WriteWRAM(uint32 A, uint8 V) {

diff --git a/src/mappers/mapper303.c b/src/mappers/mapper303.c
@@ -71,7 +71,7 @@ static void UNLKS7017Write(uint32 A, uint8 V) {
 
 static uint8 FDSRead4030(uint32 A) {
 	X6502_IRQEnd(FCEU_IQEXT);
-	return X.IRQlow & FCEU_IQEXT ? 1 : 0;
+	return cpu.IRQlow & FCEU_IQEXT ? 1 : 0;
 }
 
 static void UNL7017IRQ(int a) {

diff --git a/src/mappers/mapper332.c b/src/mappers/mapper332.c
@@ -53,7 +53,7 @@ static void Sync(void) {
 
 static uint8 BMCWSRead(uint32 A) {
 	if ((creg >> 6) & (dipSwitch &3))
-		return X.DB;
+		return cpu.DB;
 	return CartBR(A);
 }
 

diff --git a/src/mappers/mapper334.c b/src/mappers/mapper334.c
@@ -38,8 +38,8 @@ static void M334Write(uint32 A, uint8 V) {
 
 static uint8 M334Read(uint32 A) {
     if (A & 2)
-        return ((X.DB & 0xFE) | (dipswitch & 1));
-    return X.DB;
+        return ((cpu.DB & 0xFE) | (dipswitch & 1));
+    return cpu.DB;
 }
 
 static void M334Reset(void) {

diff --git a/src/mappers/mapper342.c b/src/mappers/mapper342.c
@@ -1922,7 +1922,7 @@ static uint8 MAFRAM(uint32 A) {
 	if (map_rom_on_6000 && (A >= 0x6000) && (A < 0x8000))
 		return CartBR(A); /* PRG */
 
-	return X.DB; /* Open bus */
+	return cpu.DB; /* Open bus */
 }
 
 static void COOLGIRL_ScanlineCounter(void) {

diff --git a/src/mappers/mapper372.c b/src/mappers/mapper372.c
@@ -69,8 +69,8 @@ static void M372Write(uint32 A, uint8 V) {
 static uint8 M372Read(uint32 A) {
 	uint32 addr = 1 << (EXPREGS[5] + 4);
 	if (A & (addr | (addr - 1)))
-		return X.DB | 1;
-	return X.DB;
+		return cpu.DB | 1;
+	return cpu.DB;
 }
 
 static void M372Reset(void) {

diff --git a/src/mappers/mapper401.c b/src/mappers/mapper401.c
@@ -47,7 +47,7 @@ static void M401PW(uint32 A, uint8 V) {
 
 static uint8 M401Read(uint32 A) {
 	if ((dipswitch & 1) && (EXPREGS[1] & 0x80))
-		return X.DB;
+		return cpu.DB;
 	return CartBR(A);
 }
 

diff --git a/src/mappers/mapper460.c b/src/mappers/mapper460.c
@@ -22,7 +22,7 @@
 
 static uint8 *CHRRAM =NULL;
 
-static uint8 Mapper460_ReadOB(uint32 A) { return X.DB; }
+static uint8 Mapper460_ReadOB(uint32 A) { return cpu.DB; }
 
 static void Mapper460_PRGWrap(uint32 A, uint8 V) {
 	int prgAND =0x0F;

diff --git a/src/mappers/mapper466.c b/src/mappers/mapper466.c
@@ -28,7 +28,7 @@ static SFORMAT StateRegs[] =
    { 0 }
 };
 
-static uint8 Mapper466_ReadOB(uint32 A) { return X.DB; }
+static uint8 Mapper466_ReadOB(uint32 A) { return cpu.DB; }
 
 static void Mapper466_Sync(void)
 {

diff --git a/src/mappers/mapper518.c b/src/mappers/mapper518.c
@@ -58,9 +58,8 @@ static void UNLD2000Write(uint32 A, uint8 V) {
 
 static uint8 UNLD2000Read(uint32 A) {
 	if (prg & 0x40)
-		return X.DB;
-	else
-		return CartBR(A);
+		return cpu.DB;
+	return CartBR(A);
 }
 
 static void UNLD2000Power(void) {