Core: Code clean up for clang
This commit is contained in:
parent
ae62981aef
commit
c0341bb759
|
@ -5,8 +5,8 @@
|
|||
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
|
||||
#include <Project64-core/N64System/Mips/Rumblepak.h>
|
||||
#include <Project64-core/N64System/Mips/Transferpak.h>
|
||||
#include <Project64-core/N64System/SystemGlobals.h>
|
||||
#include <Project64-core/N64System/N64System.h>
|
||||
#include <Project64-core/N64System/SystemGlobals.h>
|
||||
|
||||
PifRamHandler::PifRamHandler(CN64System & System, bool SavesReadOnly) :
|
||||
m_MMU(System.m_MMU_VM),
|
||||
|
@ -134,9 +134,7 @@ void PifRamHandler::DMA_READ()
|
|||
HexData[0] = '\0';
|
||||
AsciiData[0] = '\0';
|
||||
}
|
||||
sprintf(Addon, "%02X %02X %02X %02X",
|
||||
m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1],
|
||||
m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
sprintf(Addon, "%02X %02X %02X %02X", m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
strcat(HexData, Addon);
|
||||
if (((count + 1) % 4) != 0)
|
||||
{
|
||||
|
@ -144,9 +142,7 @@ void PifRamHandler::DMA_READ()
|
|||
strcat(HexData, Addon);
|
||||
}
|
||||
|
||||
sprintf(Addon, "%c%c%c%c",
|
||||
m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1],
|
||||
m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
sprintf(Addon, "%c%c%c%c", m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
strcat(AsciiData, Addon);
|
||||
|
||||
if (((count + 1) % 4) == 0)
|
||||
|
@ -236,9 +232,7 @@ void PifRamHandler::DMA_WRITE()
|
|||
HexData[0] = '\0';
|
||||
AsciiData[0] = '\0';
|
||||
}
|
||||
sprintf(Addon, "%02X %02X %02X %02X",
|
||||
m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1],
|
||||
m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
sprintf(Addon, "%02X %02X %02X %02X", m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
strcat(HexData, Addon);
|
||||
if (((count + 1) % 4) != 0)
|
||||
{
|
||||
|
@ -246,9 +240,7 @@ void PifRamHandler::DMA_WRITE()
|
|||
strcat(HexData, Addon);
|
||||
}
|
||||
|
||||
sprintf(Addon, "%c%c%c%c",
|
||||
m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1],
|
||||
m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
sprintf(Addon, "%c%c%c%c", m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
strcat(AsciiData, Addon);
|
||||
|
||||
if (((count + 1) % 4) == 0)
|
||||
|
@ -515,9 +507,7 @@ void PifRamHandler::LogControllerPakData(const char * Description)
|
|||
HexData[0] = '\0';
|
||||
AsciiData[0] = '\0';
|
||||
}
|
||||
sprintf(Addon, "%02X %02X %02X %02X",
|
||||
m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1],
|
||||
m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
sprintf(Addon, "%02X %02X %02X %02X", m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3]);
|
||||
strcat(HexData, Addon);
|
||||
if (((count + 1) % 4) != 0)
|
||||
{
|
||||
|
|
|
@ -148,7 +148,6 @@ public:
|
|||
return m_PifRamHandler;
|
||||
};
|
||||
|
||||
|
||||
private:
|
||||
CMipsMemoryVM();
|
||||
CMipsMemoryVM(const CMipsMemoryVM &);
|
||||
|
|
|
@ -107,7 +107,6 @@ bool R4300iInstruction::DelaySlotEffectsCompare(uint32_t DelayInstruction) const
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
void R4300iInstruction::ReadsGPR(uint32_t & Reg1, uint32_t & Reg2) const
|
||||
{
|
||||
uint32_t op = m_Instruction.op;
|
||||
|
|
|
@ -103,7 +103,7 @@ private:
|
|||
void LogSectionInfo();
|
||||
bool SetSection(CCodeSection *& Section, CCodeSection * CurrentSection, uint32_t TargetPC, bool LinkAllowed, uint32_t CurrentPC);
|
||||
bool AnalyzeInstruction(uint32_t PC, uint32_t & TargetPC, uint32_t & ContinuePC, bool & LikelyBranch, bool & IncludeDelaySlot, bool & EndBlock, bool & PermLoop);
|
||||
void handleError(asmjit::Error err, const char* message, asmjit::BaseEmitter* origin);
|
||||
void handleError(asmjit::Error err, const char * message, asmjit::BaseEmitter * origin);
|
||||
|
||||
asmjit::Environment m_Environment;
|
||||
asmjit::CodeHolder m_CodeHolder;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <Project64-core/N64System/N64Types.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
#include <Project64-core/N64System/Recompiler/RegInfo.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
|
||||
class CCodeBlock;
|
||||
|
||||
|
|
|
@ -405,7 +405,7 @@ CCompiledFunc * CRecompiler::CompileCode()
|
|||
WriteTrace(TraceRecompiler, TraceDebug, "Info->Function() = %X", Func->Function());
|
||||
std::string dumpline;
|
||||
uint32_t start_address = (uint32_t)(Func->Function()) & ~1;
|
||||
for (uint8_t * ptr = (uint8_t *)start_address, * ptr_end = ((uint8_t *)start_address) + CodeLen; ptr < ptr_end; ptr++)
|
||||
for (uint8_t *ptr = (uint8_t *)start_address, *ptr_end = ((uint8_t *)start_address) + CodeLen; ptr < ptr_end; ptr++)
|
||||
{
|
||||
if (dumpline.empty())
|
||||
{
|
||||
|
|
|
@ -9837,7 +9837,7 @@ void CX86RecompilerOps::CompileStoreMemoryValue(asmjit::x86::Gp AddressReg, asmj
|
|||
}
|
||||
else
|
||||
{
|
||||
m_Assembler.mov(asmjit::x86::dword_ptr(AddressReg, TempReg), ValueReg );
|
||||
m_Assembler.mov(asmjit::x86::dword_ptr(AddressReg, TempReg), ValueReg);
|
||||
}
|
||||
}
|
||||
else if (ValueSize == 64)
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
#include <Project64-core/N64System/Interpreter/InterpreterOps.h>
|
||||
#include <Project64-core/N64System/Mips/R4300iOpcode.h>
|
||||
#include <Project64-core/N64System/Mips/Register.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
#include <Project64-core/N64System/Recompiler/ExitInfo.h>
|
||||
#include <Project64-core/N64System/Recompiler/JumpInfo.h>
|
||||
#include <Project64-core/N64System/Recompiler/RecompilerOps.h>
|
||||
#include <Project64-core/N64System/Recompiler/RegInfo.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
#include <Project64-core/N64System/Recompiler/x86/x86ops.h>
|
||||
#include <Project64-core/Settings/GameSettings.h>
|
||||
#include <Project64-core/Settings/N64SystemSettings.h>
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#if defined(__i386__) || defined(_M_IX86)
|
||||
#include <Project64-core/N64System/Mips/Register.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
#include <Project64-core/N64System/Recompiler/RegBase.h>
|
||||
#include <Project64-core/N64System/Recompiler/asmjit.h>
|
||||
#include <Project64-core/N64System/Recompiler/x86/x86ops.h>
|
||||
#include <Project64-core/Settings/DebugSettings.h>
|
||||
|
||||
|
|
|
@ -949,7 +949,7 @@ CX86Ops::x86Reg CX86Ops::RegValue(const asmjit::x86::Gp & Reg)
|
|||
return x86_EAX;
|
||||
}
|
||||
|
||||
asmjit::Error CX86Ops::_log(const char* data, size_t size) noexcept
|
||||
asmjit::Error CX86Ops::_log(const char * data, size_t size) noexcept
|
||||
{
|
||||
stdstr AsmjitLog(std::string(data, size));
|
||||
AsmjitLog.Trim("\n");
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "stdafx.h"
|
||||
|
||||
#include <Project64-core\N64System\Mips\R4300iInstruction.h>
|
||||
#include "Debugger-RegisterTabs.h"
|
||||
#include "OpInfo.h"
|
||||
#include <Project64-core\N64System\Mips\R4300iInstruction.h>
|
||||
|
||||
bool CRegisterTabs::m_bColorsEnabled = false;
|
||||
CDebuggerUI * CRegisterTabs::m_Debugger = nullptr;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "stdafx.h"
|
||||
|
||||
#include <Project64-core\N64System\Mips\R4300iInstruction.h>
|
||||
#include "DebuggerUI.h"
|
||||
#include <Project64-core\N64System\Mips\R4300iInstruction.h>
|
||||
|
||||
#include "CPULog.h"
|
||||
#include "DMALog.h"
|
||||
|
|
Loading…
Reference in New Issue