mirror of
https://github.com/jpd002/Play-.git
synced 2025-04-28 13:47:57 +03:00
Use proper preprocessor macro.
Some checks failed
Build Android / build_android (apk) (push) Has been cancelled
Build Android / build_android (libretro) (push) Has been cancelled
Build iOS / build_ios (push) Has been cancelled
Build JavaScript / build_js (push) Has been cancelled
Build Linux / build_linux (push) Has been cancelled
Build Linux ARM32 / build_linux_arm32 (push) Has been cancelled
Build Linux ARM64 / build_linux_arm64 (push) Has been cancelled
Build macOS / build_macos (push) Has been cancelled
Build Windows / build_windows (x86_32, Visual Studio 16 2019, installer32.nsi, win32_msvc2019, Win32) (push) Has been cancelled
Build Windows / build_windows (x86_64, Visual Studio 16 2019, installer64.nsi, win64_msvc2019_64, x64) (push) Has been cancelled
Build Windows Psf / build_windows_psf (off, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Build Windows Psf / build_windows_psf (on, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Check Format / run_clangformat (push) Has been cancelled
Some checks failed
Build Android / build_android (apk) (push) Has been cancelled
Build Android / build_android (libretro) (push) Has been cancelled
Build iOS / build_ios (push) Has been cancelled
Build JavaScript / build_js (push) Has been cancelled
Build Linux / build_linux (push) Has been cancelled
Build Linux ARM32 / build_linux_arm32 (push) Has been cancelled
Build Linux ARM64 / build_linux_arm64 (push) Has been cancelled
Build macOS / build_macos (push) Has been cancelled
Build Windows / build_windows (x86_32, Visual Studio 16 2019, installer32.nsi, win32_msvc2019, Win32) (push) Has been cancelled
Build Windows / build_windows (x86_64, Visual Studio 16 2019, installer64.nsi, win64_msvc2019_64, x64) (push) Has been cancelled
Build Windows Psf / build_windows_psf (off, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Build Windows Psf / build_windows_psf (on, x86_64, Visual Studio 16 2019, installer64.nsi, x64) (push) Has been cancelled
Check Format / run_clangformat (push) Has been cancelled
This commit is contained in:
parent
0ab4a22725
commit
e46557675b
6 changed files with 21 additions and 21 deletions
|
@ -345,7 +345,7 @@ uint32 CDMAC::ReceiveDMA9(uint32 nSrcAddress, uint32 nCount, uint32 unused, bool
|
||||||
|
|
||||||
uint32 CDMAC::GetRegister(uint32 nAddress)
|
uint32 CDMAC::GetRegister(uint32 nAddress)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleGet(nAddress);
|
DisassembleGet(nAddress);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -986,7 +986,7 @@ void CDMAC::SetRegister(uint32 nAddress, uint32 nData)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleSet(nAddress, nData);
|
DisassembleSet(nAddress, nData);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -299,7 +299,7 @@ uint32 CGIF::ProcessSinglePacket(const uint8* memory, uint32 memorySize, uint32
|
||||||
CProfilerZone profilerZone(m_gifProfilerZone);
|
CProfilerZone profilerZone(m_gifProfilerZone);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_DEBUG) && defined(DEBUGGER_INCLUDED)
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Print(LOG_NAME, "Received GIF packet on path %d at 0x%08X of 0x%08X bytes.\r\n",
|
CLog::GetInstance().Print(LOG_NAME, "Received GIF packet on path %d at 0x%08X of 0x%08X bytes.\r\n",
|
||||||
packetMetadata.pathIndex, address, end - address);
|
packetMetadata.pathIndex, address, end - address);
|
||||||
#endif
|
#endif
|
||||||
|
@ -322,7 +322,7 @@ uint32 CGIF::ProcessSinglePacket(const uint8* memory, uint32 memorySize, uint32
|
||||||
//We need to update the registers
|
//We need to update the registers
|
||||||
auto tag = *reinterpret_cast<const TAG*>(&memory[address]);
|
auto tag = *reinterpret_cast<const TAG*>(&memory[address]);
|
||||||
address += 0x10;
|
address += 0x10;
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Print(LOG_NAME, "TAG(loops = %d, eop = %d, pre = %d, prim = 0x%04X, cmd = %d, nreg = %d);\r\n",
|
CLog::GetInstance().Print(LOG_NAME, "TAG(loops = %d, eop = %d, pre = %d, prim = 0x%04X, cmd = %d, nreg = %d);\r\n",
|
||||||
tag.loops, tag.eop, tag.pre, tag.prim, tag.cmd, tag.nreg);
|
tag.loops, tag.eop, tag.pre, tag.prim, tag.cmd, tag.nreg);
|
||||||
#endif
|
#endif
|
||||||
|
@ -403,7 +403,7 @@ uint32 CGIF::ProcessSinglePacket(const uint8* memory, uint32 memorySize, uint32
|
||||||
|
|
||||||
m_gs->ProcessWriteBuffer(&packetMetadata);
|
m_gs->ProcessWriteBuffer(&packetMetadata);
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Print(LOG_NAME, "Processed 0x%08X bytes.\r\n", address - start);
|
CLog::GetInstance().Print(LOG_NAME, "Processed 0x%08X bytes.\r\n", address - start);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -571,7 +571,7 @@ uint32 CGIF::GetRegister(uint32 address)
|
||||||
CLog::GetInstance().Warn(LOG_NAME, "Reading unknown register 0x%08X.\r\n", address);
|
CLog::GetInstance().Warn(LOG_NAME, "Reading unknown register 0x%08X.\r\n", address);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleGet(address);
|
DisassembleGet(address);
|
||||||
#endif
|
#endif
|
||||||
return result;
|
return result;
|
||||||
|
@ -592,7 +592,7 @@ void CGIF::SetRegister(uint32 address, uint32 value)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleSet(address, value);
|
DisassembleSet(address, value);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,8 +141,8 @@ void CIPU::Reset()
|
||||||
|
|
||||||
uint32 CIPU::GetRegister(uint32 nAddress)
|
uint32 CIPU::GetRegister(uint32 nAddress)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
// DisassembleGet(nAddress);
|
DisassembleGet(nAddress);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
switch(nAddress)
|
switch(nAddress)
|
||||||
|
@ -232,7 +232,7 @@ uint32 CIPU::GetRegister(uint32 nAddress)
|
||||||
|
|
||||||
void CIPU::SetRegister(uint32 nAddress, uint32 nValue)
|
void CIPU::SetRegister(uint32 nAddress, uint32 nValue)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleSet(nAddress, nValue);
|
DisassembleSet(nAddress, nValue);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -253,7 +253,7 @@ void CIPU::SetRegister(uint32 nAddress, uint32 nValue)
|
||||||
InitializeCommand(nValue);
|
InitializeCommand(nValue);
|
||||||
m_isBusy = true;
|
m_isBusy = true;
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleCommand(nValue);
|
DisassembleCommand(nValue);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -3377,7 +3377,7 @@ void CPS2OS::HandleTLBException()
|
||||||
|
|
||||||
void CPS2OS::DisassembleSysCall(uint8 func)
|
void CPS2OS::DisassembleSysCall(uint8 func)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
std::string description(GetSysCallDescription(func));
|
std::string description(GetSysCallDescription(func));
|
||||||
if(description.length() != 0)
|
if(description.length() != 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -181,7 +181,7 @@ uint32 CVif::GetRegister(uint32 address)
|
||||||
CLog::GetInstance().Warn(LOG_NAME, "Reading unknown register 0x%08X.\r\n", address);
|
CLog::GetInstance().Warn(LOG_NAME, "Reading unknown register 0x%08X.\r\n", address);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleGet(address);
|
DisassembleGet(address);
|
||||||
#endif
|
#endif
|
||||||
return result;
|
return result;
|
||||||
|
@ -245,7 +245,7 @@ void CVif::SetRegister(uint32 address, uint32 value)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
DisassembleSet(address, value);
|
DisassembleSet(address, value);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -363,7 +363,7 @@ uint32 CVif::ReceiveDMA(uint32 address, uint32 qwc, uint32 unused, bool tagInclu
|
||||||
CProfilerZone profilerZone(m_vifProfilerZone);
|
CProfilerZone profilerZone(m_vifProfilerZone);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Print(LOG_NAME, "vif%i : Processing packet @ 0x%08X, qwc = 0x%X, tagIncluded = %i\r\n",
|
CLog::GetInstance().Print(LOG_NAME, "vif%i : Processing packet @ 0x%08X, qwc = 0x%X, tagIncluded = %i\r\n",
|
||||||
m_number, address, qwc, static_cast<int>(tagIncluded));
|
m_number, address, qwc, static_cast<int>(tagIncluded));
|
||||||
#endif
|
#endif
|
||||||
|
@ -476,7 +476,7 @@ void CVif::ProcessPacket(StreamType& stream)
|
||||||
|
|
||||||
void CVif::ExecuteCommand(StreamType& stream, CODE nCommand)
|
void CVif::ExecuteCommand(StreamType& stream, CODE nCommand)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
if(m_number == 0)
|
if(m_number == 0)
|
||||||
{
|
{
|
||||||
DisassembleCommand(nCommand);
|
DisassembleCommand(nCommand);
|
||||||
|
|
|
@ -529,7 +529,7 @@ void CGSHandler::WritePrivRegister(uint32 nAddress, uint32 nData)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
if(nAddress & 0x04)
|
if(nAddress & 0x04)
|
||||||
{
|
{
|
||||||
LogPrivateWrite(nAddress);
|
LogPrivateWrite(nAddress);
|
||||||
|
@ -587,7 +587,7 @@ void CGSHandler::MarkNewFrame()
|
||||||
OnNewFrame(m_drawCallCount);
|
OnNewFrame(m_drawCallCount);
|
||||||
m_drawCallCount = 0;
|
m_drawCallCount = 0;
|
||||||
UpdateFrameDumpState();
|
UpdateFrameDumpState();
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Print(LOG_NAME, "Frame Done.\r\n---------------------------------------------------------------------------------\r\n");
|
CLog::GetInstance().Print(LOG_NAME, "Frame Done.\r\n---------------------------------------------------------------------------------\r\n");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -816,7 +816,7 @@ void CGSHandler::WriteRegisterImpl(uint8 nRegister, uint64 nData)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
LogWrite(nRegister, nData);
|
LogWrite(nRegister, nData);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -825,7 +825,7 @@ void CGSHandler::FeedImageDataImpl(const uint8* imageData, uint32 length)
|
||||||
{
|
{
|
||||||
if(m_trxCtx.nSize == 0)
|
if(m_trxCtx.nSize == 0)
|
||||||
{
|
{
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
CLog::GetInstance().Warn(LOG_NAME, "Warning. Received image data when no transfer was expected.\r\n");
|
CLog::GetInstance().Warn(LOG_NAME, "Warning. Received image data when no transfer was expected.\r\n");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -843,7 +843,7 @@ void CGSHandler::FeedImageDataImpl(const uint8* imageData, uint32 length)
|
||||||
{
|
{
|
||||||
ProcessHostToLocalTransfer();
|
ProcessHostToLocalTransfer();
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#if LOGGING_ENABLED
|
||||||
auto bltBuf = make_convertible<BITBLTBUF>(m_nReg[GS_REG_BITBLTBUF]);
|
auto bltBuf = make_convertible<BITBLTBUF>(m_nReg[GS_REG_BITBLTBUF]);
|
||||||
CLog::GetInstance().Print(LOG_NAME, "Completed image transfer at 0x%08X (dirty = %d).\r\n", bltBuf.GetDstPtr(), m_trxCtx.nDirty);
|
CLog::GetInstance().Print(LOG_NAME, "Completed image transfer at 0x%08X (dirty = %d).\r\n", bltBuf.GetDstPtr(), m_trxCtx.nDirty);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue