ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Convert %I64U to %llx

This commit is contained in:
zilmar 2023-11-16 09:03:32 +10:30
parent e46ffde6b3
commit a0130ff896
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/N64System/Mips/Register.cpp
View File

@ -541,7 +541,7 @@ void CRegisters::Cop0_MT(COP0Reg Reg, uint64_t Value)
{ {
if (LogCP0changes() && Reg <= COP0Reg_31) if (LogCP0changes() && Reg <= COP0Reg_31)
{ {
LogMessage("%08X: Writing 0x%I64U to %s register (originally: 0x%I64U)", m_PROGRAM_COUNTER, Value, CRegName::Cop0[Reg], m_CP0[Reg]); LogMessage("%08X: Writing 0x%llX to %s register (originally: 0x%llX)", m_PROGRAM_COUNTER, Value, CRegName::Cop0[Reg], m_CP0[Reg]);
if (Reg == 11) // Compare if (Reg == 11) // Compare
{ {
LogMessage("%08X: Cause register changed from %08X to %08X", m_PROGRAM_COUNTER, (uint32_t)CAUSE_REGISTER.Value, (uint32_t)(g_Reg->CAUSE_REGISTER.Value & ~CAUSE_IP7)); LogMessage("%08X: Cause register changed from %08X to %08X", m_PROGRAM_COUNTER, (uint32_t)CAUSE_REGISTER.Value, (uint32_t)(g_Reg->CAUSE_REGISTER.Value & ~CAUSE_IP7));

4
Source/Project64-core/N64System/Mips/TLB.cpp
View File

@ -125,7 +125,7 @@ void CTLB::ReadEntry()
void CTLB::WriteEntry(uint32_t Index, bool Random) void CTLB::WriteEntry(uint32_t Index, bool Random)
{ {
WriteTrace(TraceTLB, TraceDebug, "%02d %d %I64X %I64X %I64X %I64X", Index, Random, m_Reg.PAGE_MASK_REGISTER, m_Reg.ENTRYHI_REGISTER, m_Reg.ENTRYLO0_REGISTER, m_Reg.ENTRYLO1_REGISTER); WriteTrace(TraceTLB, TraceDebug, "%02d %d %llX %llX %llX %llX", Index, Random, m_Reg.PAGE_MASK_REGISTER, m_Reg.ENTRYHI_REGISTER, m_Reg.ENTRYLO0_REGISTER, m_Reg.ENTRYLO1_REGISTER);
// Check to see if entry is unmapping itself // Check to see if entry is unmapping itself
if (m_tlb[Index].EntryDefined) if (m_tlb[Index].EntryDefined)
@ -135,7 +135,7 @@ void CTLB::WriteEntry(uint32_t Index, bool Random)
m_Reg.m_PROGRAM_COUNTER < m_FastTlb[FastIndx].VEND && m_Reg.m_PROGRAM_COUNTER < m_FastTlb[FastIndx].VEND &&
m_FastTlb[FastIndx].ValidEntry && m_FastTlb[FastIndx].VALID) m_FastTlb[FastIndx].ValidEntry && m_FastTlb[FastIndx].VALID)
{ {
WriteTrace(TraceTLB, TraceDebug, "Ignored PC: %X VAddr Start: %I64X VEND: %I64X", m_Reg.m_PROGRAM_COUNTER, m_FastTlb[FastIndx].VSTART, m_FastTlb[FastIndx].VEND); WriteTrace(TraceTLB, TraceDebug, "Ignored PC: %X VAddr Start: %llX VEND: %llX", m_Reg.m_PROGRAM_COUNTER, m_FastTlb[FastIndx].VSTART, m_FastTlb[FastIndx].VEND);
return; return;
} }
if (m_Reg.m_PROGRAM_COUNTER >= m_FastTlb[FastIndx + 1].VSTART && if (m_Reg.m_PROGRAM_COUNTER >= m_FastTlb[FastIndx + 1].VSTART &&

2
Source/Project64-core/N64System/N64Rom.cpp
View File

@ -327,7 +327,7 @@ void CN64Rom::CalculateCicChip()
{ {
if (HaveDebugger()) if (HaveDebugger())
{ {
g_Notify->DisplayError(stdstr_f("Unknown CIC checksum:\n%I64X.", CRC).c_str()); g_Notify->DisplayError(stdstr_f("Unknown CIC checksum:\n%llX.", CRC).c_str());
} }
} }
} }

10
Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp
View File

@ -139,7 +139,7 @@ void CDebugTlb::RefreshTLBWindow(void)
} }
if (tlb[count].EntryDefined) if (tlb[count].EntryDefined)
{ {
swprintf(Output, sizeof(Output), L"0x%I64X", tlb[count].PageMask.Value); swprintf(Output, sizeof(Output), L"0x%llX", tlb[count].PageMask.Value);
} }
else else
{ {
@ -155,7 +155,7 @@ void CDebugTlb::RefreshTLBWindow(void)
if (tlb[count].EntryDefined) if (tlb[count].EntryDefined)
{ {
swprintf(Output, sizeof(Output), L"0x%I64X", tlb[count].EntryHi.Value); swprintf(Output, sizeof(Output), L"0x%llX", tlb[count].EntryHi.Value);
} }
else else
{ {
@ -171,7 +171,7 @@ void CDebugTlb::RefreshTLBWindow(void)
if (tlb[count].EntryDefined) if (tlb[count].EntryDefined)
{ {
swprintf(Output, sizeof(Output), L"0x%I64X", tlb[count].EntryLo0.Value); swprintf(Output, sizeof(Output), L"0x%llX", tlb[count].EntryLo0.Value);
} }
else else
{ {
@ -187,7 +187,7 @@ void CDebugTlb::RefreshTLBWindow(void)
if (tlb[count].EntryDefined) if (tlb[count].EntryDefined)
{ {
swprintf(Output, sizeof(Output), L"0x%I64X", tlb[count].EntryLo1.Value); swprintf(Output, sizeof(Output), L"0x%llX", tlb[count].EntryLo1.Value);
} }
else else
{ {
@ -265,7 +265,7 @@ void CDebugTlb::RefreshTLBWindow(void)
if (FastTlb[count].ValidEntry && FastTlb[count].VALID) if (FastTlb[count].ValidEntry && FastTlb[count].VALID)
{ {
swprintf(Output, sizeof(Output), L"%I64X:%I64X -> %08X:%08X", FastTlb[count].VSTART, FastTlb[count].VEND, swprintf(Output, sizeof(Output), L"%llX:%llX -> %08X:%08X", FastTlb[count].VSTART, FastTlb[count].VEND,
FastTlb[count].PHYSSTART, FastTlb[count].PHYSEND); FastTlb[count].PHYSSTART, FastTlb[count].PHYSEND);
} }
else else

2
Source/Project64/UserInterface/Debugger/Symbols.cpp
View File

@ -330,7 +330,7 @@ void CSymbolTable::GetValueString(char * dst, CSymbol * symbol)
break; break;
case SYM_U64: case SYM_U64:
m_Debugger->DebugLoad_VAddr(address, value.u64); m_Debugger->DebugLoad_VAddr(address, value.u64);
sprintf(dst, "%I64u", value.u64); sprintf(dst, "%lld", value.u64);
break; break;
case SYM_S8: case SYM_S8:
m_Debugger->DebugLoad_VAddr(address, value.s8); m_Debugger->DebugLoad_VAddr(address, value.s8);