From 56df9b7508f90e68aaea4065fb14305e3408336e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 21 Apr 2015 23:01:25 -0400
Subject: [PATCH] GPFifo: Remove unused parameters from Write[x] functions
---
Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 30 +++++++++++-----------
Source/Core/Core/HW/GPFifo.cpp | 8 +++---
Source/Core/Core/HW/GPFifo.h | 8 +++---
Source/Core/Core/PowerPC/MMU.cpp | 16 ++++++------
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index deb1d01bbe..b2a7fd36ae 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -294,7 +294,7 @@ void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end)
while (written < burstEnd)
GPFifo::FastWrite8(data[written++]);
- GPFifo::Write8(data[written++], 0);
+ GPFifo::Write8(data[written++]);
// Advance core timing
u32 elapsedCycles = u32(((u64)written * m_CyclesPerFrame) / m_FrameFifoSize);
@@ -414,43 +414,43 @@ void FifoPlayer::FlushWGP()
{
// Send 31 0s through the WGP
for (int i = 0; i < 7; ++i)
- GPFifo::Write32(0, 0);
- GPFifo::Write16(0, 0);
- GPFifo::Write8(0, 0);
+ GPFifo::Write32(0);
+ GPFifo::Write16(0);
+ GPFifo::Write8(0);
GPFifo::ResetGatherPipe();
}
void FifoPlayer::LoadBPReg(u8 reg, u32 value)
{
- GPFifo::Write8(0x61, 0); // load BP reg
+ GPFifo::Write8(0x61); // load BP reg
u32 cmd = (reg << 24) & 0xff000000;
cmd |= (value & 0x00ffffff);
- GPFifo::Write32(cmd, 0);
+ GPFifo::Write32(cmd);
}
void FifoPlayer::LoadCPReg(u8 reg, u32 value)
{
- GPFifo::Write8(0x08, 0); // load CP reg
- GPFifo::Write8(reg, 0);
- GPFifo::Write32(value, 0);
+ GPFifo::Write8(0x08); // load CP reg
+ GPFifo::Write8(reg);
+ GPFifo::Write32(value);
}
void FifoPlayer::LoadXFReg(u16 reg, u32 value)
{
- GPFifo::Write8(0x10, 0); // load XF reg
- GPFifo::Write32((reg & 0x0fff) | 0x1000, 0); // load 4 bytes into reg
- GPFifo::Write32(value, 0);
+ GPFifo::Write8(0x10); // load XF reg
+ GPFifo::Write32((reg & 0x0fff) | 0x1000); // load 4 bytes into reg
+ GPFifo::Write32(value);
}
void FifoPlayer::LoadXFMem16(u16 address, u32 *data)
{
// Loads 16 * 4 bytes in xf memory starting at address
- GPFifo::Write8(0x10, 0); // load XF reg
- GPFifo::Write32(0x000f0000 | (address & 0xffff), 0); // load 16 * 4 bytes into address
+ GPFifo::Write8(0x10); // load XF reg
+ GPFifo::Write32(0x000f0000 | (address & 0xffff)); // load 16 * 4 bytes into address
for (int i = 0; i < 16; ++i)
- GPFifo::Write32(data[i], 0);
+ GPFifo::Write32(data[i]);
}
bool FifoPlayer::ShouldLoadBP(u8 address)
diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp
index f91283b547..239a86dd1a 100644
--- a/Source/Core/Core/HW/GPFifo.cpp
+++ b/Source/Core/Core/HW/GPFifo.cpp
@@ -103,21 +103,21 @@ void CheckGatherPipe()
}
}
-void Write8(const u8 _iValue, const u32 _iAddress)
+void Write8(const u8 _iValue)
{
// LOG(GPFIFO, "GPFIFO #%x: 0x%02x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
FastWrite8(_iValue);
CheckGatherPipe();
}
-void Write16(const u16 _iValue, const u32 _iAddress)
+void Write16(const u16 _iValue)
{
// LOG(GPFIFO, "GPFIFO #%x: 0x%04x",ProcessorInterface::Fifo_CPUWritePointer+m_gatherPipeCount, _iValue);
FastWrite16(_iValue);
CheckGatherPipe();
}
-void Write32(const u32 _iValue, const u32 _iAddress)
+void Write32(const u32 _iValue)
{
//#ifdef _DEBUG
// float floatvalue = *(float*)&_iValue;
@@ -127,7 +127,7 @@ void Write32(const u32 _iValue, const u32 _iAddress)
CheckGatherPipe();
}
-void Write64(const u64 _iValue, const u32 _iAddress)
+void Write64(const u64 _iValue)
{
FastWrite64(_iValue);
CheckGatherPipe();
diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h
index f9698e5332..55dc81dffd 100644
--- a/Source/Core/Core/HW/GPFifo.h
+++ b/Source/Core/Core/HW/GPFifo.h
@@ -32,10 +32,10 @@ void FastCheckGatherPipe();
bool IsEmpty();
// Write
-void Write8(const u8 _iValue, const u32 _iAddress);
-void Write16(const u16 _iValue, const u32 _iAddress);
-void Write32(const u32 _iValue, const u32 _iAddress);
-void Write64(const u64 _iValue, const u32 _iAddress);
+void Write8(const u8 _iValue);
+void Write16(const u16 _iValue);
+void Write32(const u32 _iValue);
+void Write64(const u64 _iValue);
// These expect pre-byteswapped values
// Also there's an upper limit of about 512 per batch
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
index 08b8874f33..308c7d482b 100644
--- a/Source/Core/Core/PowerPC/MMU.cpp
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -244,10 +244,10 @@ __forceinline static void WriteToHardware(u32 em_address, const T data)
{
switch (sizeof(T))
{
- case 1: GPFifo::Write8((u8)data, em_address); return;
- case 2: GPFifo::Write16((u16)data, em_address); return;
- case 4: GPFifo::Write32((u32)data, em_address); return;
- case 8: GPFifo::Write64((u64)data, em_address); return;
+ case 1: GPFifo::Write8((u8)data); return;
+ case 2: GPFifo::Write16((u16)data); return;
+ case 4: GPFifo::Write32((u32)data); return;
+ case 8: GPFifo::Write64((u64)data); return;
}
}
if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0xC8000000)
@@ -299,10 +299,10 @@ __forceinline static void WriteToHardware(u32 em_address, const T data)
{
switch (sizeof(T))
{
- case 1: GPFifo::Write8((u8)data, em_address); return;
- case 2: GPFifo::Write16((u16)data, em_address); return;
- case 4: GPFifo::Write32((u32)data, em_address); return;
- case 8: GPFifo::Write64((u64)data, em_address); return;
+ case 1: GPFifo::Write8((u8)data); return;
+ case 2: GPFifo::Write16((u16)data); return;
+ case 4: GPFifo::Write32((u32)data); return;
+ case 8: GPFifo::Write64((u64)data); return;
}
}
if (flag == FLAG_WRITE && (em_address & 0xF8000000) == 0x08000000)