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

Merge pull request #3003 from dolphin-emu/revert-2961-printf 

Partially revert "General: Toss out PRI macro usage"
This commit is contained in:
flacs 2015-09-11 14:08:58 +00:00
parent c319fbb98d 19459e827f
commit c07d672b31
36 changed files with 63 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/JitRegister.cpp
View File

@ -96,7 +96,7 @@ void RegisterV(const void* base_address, u32 code_size,
if (s_perf_map_file.IsOpen()) if (s_perf_map_file.IsOpen())
{ {
std::string entry = StringFromFormat( std::string entry = StringFromFormat(
"%llx %x %s\n", "%" PRIx64 " %x %s\n",
(u64)base_address, code_size, symbol_name.data()); (u64)base_address, code_size, symbol_name.data());
s_perf_map_file.WriteBytes(entry.data(), entry.size()); s_perf_map_file.WriteBytes(entry.data(), entry.size());
} }

7
Source/Core/Common/MemoryUtil.cpp
View File

@ -64,9 +64,6 @@ void* AllocateExecutableMemory(size_t size, bool low)
, -1, 0); , -1, 0);
#endif /* defined(_WIN32) */ #endif /* defined(_WIN32) */
// printf("Mapped executable memory at %p (size %ld)\n", ptr,
// (unsigned long)size);
#ifdef _WIN32 #ifdef _WIN32
if (ptr == nullptr) if (ptr == nullptr)
{ {
@ -84,7 +81,6 @@ void* AllocateExecutableMemory(size_t size, bool low)
{ {
map_hint += size; map_hint += size;
map_hint = (char*)round_page(map_hint); /* round up to the next page */ map_hint = (char*)round_page(map_hint); /* round up to the next page */
// printf("Next map will (hopefully) be at %p\n", map_hint);
} }
} }
#endif #endif
@ -125,9 +121,6 @@ void* AllocateAlignedMemory(size_t size, size_t alignment)
ERROR_LOG(MEMMAP, "Failed to allocate aligned memory"); ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
#endif #endif
// printf("Mapped memory at %p (size %ld)\n", ptr,
// (unsigned long)size);
if (ptr == nullptr) if (ptr == nullptr)
PanicAlert("Failed to allocate aligned memory"); PanicAlert("Failed to allocate aligned memory");

2
Source/Core/Common/SDCardUtil.cpp
View File

@ -203,7 +203,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename)
if (disk_size < 0x800000 || disk_size > 0x800000000ULL) if (disk_size < 0x800000 || disk_size > 0x800000000ULL)
{ {
ERROR_LOG(COMMON, "Trying to create SD Card image of size %lluMB is out of range (8MB-32GB)", disk_size/(1024*1024)); ERROR_LOG(COMMON, "Trying to create SD Card image of size %" PRIu64 "MB is out of range (8MB-32GB)", disk_size/(1024*1024));
return false; return false;
} }

3
Source/Core/Common/SymbolDB.cpp
View File

@ -20,8 +20,7 @@ void SymbolDB::List()
func.second.size, func.second.hash, func.second.size, func.second.hash,
func.second.numCalls); func.second.numCalls);
} }
INFO_LOG(OSHLE, "%lu functions known in this program above.", INFO_LOG(OSHLE, "%zu functions known in this program above.", functions.size());
(unsigned long)functions.size());
} }
void SymbolDB::Clear(const char *prefix) void SymbolDB::Clear(const char *prefix)

2
Source/Core/Common/SysConf.cpp
View File

@ -53,7 +53,7 @@ bool SysConf::LoadFromFile(const std::string& filename)
u64 size = File::GetSize(filename); u64 size = File::GetSize(filename);
if (size != SYSCONF_SIZE) if (size != SYSCONF_SIZE)
{ {
if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04llx)\nDo you want to generate a new one?", if (AskYesNoT("Your SYSCONF file is the wrong size.\nIt should be 0x%04x (but is 0x%04" PRIx64 ")\nDo you want to generate a new one?",
SYSCONF_SIZE, size)) SYSCONF_SIZE, size))
{ {
GenerateSysConf(); GenerateSysConf();

2
Source/Core/Common/Timer.cpp
View File

@ -147,7 +147,7 @@ std::string Timer::GetTimeElapsedFormatted() const
// Hours // Hours
u32 Hours = Minutes / 60; u32 Hours = Minutes / 60;
std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03llu", std::string TmpStr = StringFromFormat("%02i:%02i:%02i:%03" PRIu64,
Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000); Hours, Minutes % 60, Seconds % 60, Milliseconds % 1000);
return TmpStr; return TmpStr;
} }

2
Source/Core/Common/x64Emitter.cpp
View File

@ -236,7 +236,7 @@ void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
(distance < 0x80000000LL && (distance < 0x80000000LL &&
distance >= -0x80000000LL) || distance >= -0x80000000LL) ||
!warn_64bit_offset, !warn_64bit_offset,
"WriteRest: op out of range (0x%llx uses 0x%llx)", "WriteRest: op out of range (0x%" PRIx64 " uses 0x%" PRIx64 ")",
ripAddr, offset); ripAddr, offset);
s32 offs = (s32)distance; s32 offs = (s32)distance;
emit->Write32((u32)offs); emit->Write32((u32)offs);

2
Source/Core/Core/ConfigManager.cpp
View File

@ -790,7 +790,7 @@ bool SConfig::AutoSetup(EBootBS2 _BootBS2)
// Use the TitleIDhex for name and/or unique ID if launching from nand folder // Use the TitleIDhex for name and/or unique ID if launching from nand folder
// or if it is not ascii characters (specifically sysmenu could potentially apply to other things) // or if it is not ascii characters (specifically sysmenu could potentially apply to other things)
std::string titleidstr = StringFromFormat("%016llx", ContentLoader.GetTitleID()); std::string titleidstr = StringFromFormat("%016" PRIx64, ContentLoader.GetTitleID());
if (m_strName.empty()) if (m_strName.empty())
{ {

4
Source/Core/Core/CoreTiming.cpp
View File

@ -421,7 +421,7 @@ void LogPendingEvents()
Event *ptr = first; Event *ptr = first;
while (ptr) while (ptr)
{ {
INFO_LOG(POWERPC, "PENDING: Now: %lld Pending: %lld Type: %d", globalTimer, ptr->time, ptr->type); INFO_LOG(POWERPC, "PENDING: Now: %" PRId64 " Pending: %" PRId64 " Type: %d", globalTimer, ptr->time, ptr->type);
ptr = ptr->next; ptr = ptr->next;
} }
} }
@ -456,7 +456,7 @@ std::string GetScheduledEventsSummary()
const std::string& name = event_types[ptr->type].name; const std::string& name = event_types[ptr->type].name;
text += StringFromFormat("%s : %lld %016llx\n", name.c_str(), ptr->time, ptr->userdata); text += StringFromFormat("%s : %" PRIi64 " %016" PRIx64 "\n", name.c_str(), ptr->time, ptr->userdata);
ptr = ptr->next; ptr = ptr->next;
} }
return text; return text;

4
Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp
View File

@ -40,12 +40,12 @@ void ProfilerDump(u64 count)
File::IOFile pFile("DSP_Prof.txt", "wt"); File::IOFile pFile("DSP_Prof.txt", "wt");
if (pFile) if (pFile)
{ {
fprintf(pFile.GetHandle(), "Number of DSP steps: %llu\n\n", count); fprintf(pFile.GetHandle(), "Number of DSP steps: %" PRIu64 "\n\n", count);
for (int i=0; i<PROFILE_MAP_SIZE;i++) for (int i=0; i<PROFILE_MAP_SIZE;i++)
{ {
if (g_profileMap[i] > 0) if (g_profileMap[i] > 0)
{ {
fprintf(pFile.GetHandle(), "0x%04X: %llu\n", i, g_profileMap[i]); fprintf(pFile.GetHandle(), "0x%04X: %" PRIu64 "\n", i, g_profileMap[i]);
} }
} }
} }

26
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -779,7 +779,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
// Only used from WII_IPC. This is the only read command that decrypts data // Only used from WII_IPC. This is the only read command that decrypts data
case DVDLowRead: case DVDLowRead:
INFO_LOG(DVDINTERFACE, "DVDLowRead: DVDAddr: 0x%09llx, Size: 0x%x", (u64)command_2 << 2, command_1); INFO_LOG(DVDINTERFACE, "DVDLowRead: DVDAddr: 0x%09" PRIx64 ", Size: 0x%x", (u64)command_2 << 2, command_1);
read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length, read_command = ExecuteReadCommand((u64)command_2 << 2, output_address, command_1, output_length,
true, &interrupt_type, &ticks_until_completion); true, &interrupt_type, &ticks_until_completion);
break; break;
@ -846,7 +846,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
// Probably only used by Wii // Probably only used by Wii
case DVDLowUnencryptedRead: case DVDLowUnencryptedRead:
INFO_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: DVDAddr: 0x%09llx, Size: 0x%x", (u64)command_2 << 2, command_1); INFO_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: DVDAddr: 0x%09" PRIx64 ", Size: 0x%x", (u64)command_2 << 2, command_1);
// We must make sure it is in a valid area! (#001 check) // We must make sure it is in a valid area! (#001 check)
// Are these checks correct? They seem to mix 32-bit offsets and 8-bit lengths // Are these checks correct? They seem to mix 32-bit offsets and 8-bit lengths
@ -865,7 +865,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
} }
else else
{ {
WARN_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: trying to read out of bounds @ %09llx", (u64)command_2 << 2); WARN_LOG(DVDINTERFACE, "DVDLowUnencryptedRead: trying to read out of bounds @ %09" PRIx64, (u64)command_2 << 2);
g_ErrorCode = ERROR_READY | ERROR_BLOCK_OOB; g_ErrorCode = ERROR_READY | ERROR_BLOCK_OOB;
// Should cause software to call DVDLowRequestError // Should cause software to call DVDLowRequestError
interrupt_type = INT_BRKINT; interrupt_type = INT_BRKINT;
@ -904,7 +904,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
{ {
u64 iDVDOffset = (u64)command_1 << 2; u64 iDVDOffset = (u64)command_1 << 2;
INFO_LOG(DVDINTERFACE, "Read: DVDOffset=%08llx, DMABuffer = %08x, SrcLength = %08x, DMALength = %08x", INFO_LOG(DVDINTERFACE, "Read: DVDOffset=%08" PRIx64 ", DMABuffer = %08x, SrcLength = %08x, DMALength = %08x",
iDVDOffset, output_address, command_2, output_length); iDVDOffset, output_address, command_2, output_length);
if (GCAM) if (GCAM)
@ -941,7 +941,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
Memory::Write_U32(0x00000000, output_address + i); Memory::Write_U32(0x00000000, output_address + i);
break; break;
default: default:
ERROR_LOG(DVDINTERFACE, "GC-AM: UNKNOWN MEDIA BOARD LOCATION %llx", iDVDOffset); ERROR_LOG(DVDINTERFACE, "GC-AM: UNKNOWN MEDIA BOARD LOCATION %" PRIx64, iDVDOffset);
break; break;
} }
break; break;
@ -1002,7 +1002,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
while (len >= 4) while (len >= 4)
{ {
ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08llx: %08x", iDVDOffset, Memory::Read_U32(addr)); ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08" PRIx64 ": %08x", iDVDOffset, Memory::Read_U32(addr));
addr += 4; addr += 4;
len -= 4; len -= 4;
iDVDOffset += 4; iDVDOffset += 4;
@ -1014,7 +1014,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
Memory::CopyFromEmu(media_buffer + offset, addr, len); Memory::CopyFromEmu(media_buffer + offset, addr, len);
while (len >= 4) while (len >= 4)
{ {
ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08llx: %08x", iDVDOffset, Memory::Read_U32(addr)); ERROR_LOG(DVDINTERFACE, "GC-AM Media Board WRITE (0xAA): %08" PRIx64 ": %08x", iDVDOffset, Memory::Read_U32(addr));
addr += 4; addr += 4;
len -= 4; len -= 4;
iDVDOffset += 4; iDVDOffset += 4;
@ -1028,7 +1028,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
if (!GCAM) if (!GCAM)
{ {
// Currently unimplemented // Currently unimplemented
INFO_LOG(DVDINTERFACE, "Seek: offset=%09llx (ignoring)", (u64)command_1 << 2); INFO_LOG(DVDINTERFACE, "Seek: offset=%09" PRIx64 " (ignoring)", (u64)command_1 << 2);
} }
else else
{ {
@ -1190,7 +1190,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
} }
} }
INFO_LOG(DVDINTERFACE, "(Audio) Stream cmd: %08x offset: %08llx length: %08x", INFO_LOG(DVDINTERFACE, "(Audio) Stream cmd: %08x offset: %08" PRIx64 " length: %08x",
command_0, (u64)command_1 << 2, command_2); command_0, (u64)command_1 << 2, command_2);
} }
break; break;
@ -1357,7 +1357,7 @@ u64 SimulateDiscReadTime(u64 offset, u32 length)
if (offset + length - g_last_read_offset > 1024 * 1024) if (offset + length - g_last_read_offset > 1024 * 1024)
{ {
// No buffer; just use the simple seek time + read time. // No buffer; just use the simple seek time + read time.
DEBUG_LOG(DVDINTERFACE, "Seeking %lld bytes", DEBUG_LOG(DVDINTERFACE, "Seeking %" PRId64 " bytes",
s64(g_last_read_offset) - s64(offset)); s64(g_last_read_offset) - s64(offset));
ticks_until_completion = disk_read_duration; ticks_until_completion = disk_read_duration;
g_last_read_time = current_time + ticks_until_completion; g_last_read_time = current_time + ticks_until_completion;
@ -1378,20 +1378,20 @@ u64 SimulateDiscReadTime(u64 offset, u32 length)
if (current_time > buffer_fill_time) if (current_time > buffer_fill_time)
{ {
DEBUG_LOG(DVDINTERFACE, "Fast buffer read at %llx", offset); DEBUG_LOG(DVDINTERFACE, "Fast buffer read at %" PRIx64, offset);
ticks_until_completion = buffer_read_duration; ticks_until_completion = buffer_read_duration;
g_last_read_time = buffer_fill_time; g_last_read_time = buffer_fill_time;
} }
else if (current_time + disk_read_duration > buffer_fill_time) else if (current_time + disk_read_duration > buffer_fill_time)
{ {
DEBUG_LOG(DVDINTERFACE, "Slow buffer read at %llx", offset); DEBUG_LOG(DVDINTERFACE, "Slow buffer read at %" PRIx64, offset);
ticks_until_completion = std::max(buffer_fill_time - current_time, ticks_until_completion = std::max(buffer_fill_time - current_time,
buffer_read_duration); buffer_read_duration);
g_last_read_time = buffer_fill_time; g_last_read_time = buffer_fill_time;
} }
else else
{ {
DEBUG_LOG(DVDINTERFACE, "Short seek %lld bytes", DEBUG_LOG(DVDINTERFACE, "Short seek %" PRId64 " bytes",
s64(g_last_read_offset) - s64(offset)); s64(g_last_read_offset) - s64(offset));
ticks_until_completion = disk_read_duration; ticks_until_completion = disk_read_duration;
g_last_read_time = current_time + ticks_until_completion; g_last_read_time = current_time + ticks_until_completion;

2
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -181,7 +181,7 @@ GCMemcard::GCMemcard(const std::string &filename, bool forceCreation, bool ascii
} }
else else
{ {
PanicAlertT("Failed to read block %u of the save data\nMemcard may be truncated\nFile position: 0x%llx", i, mcdFile.Tell()); PanicAlertT("Failed to read block %u of the save data\nMemcard may be truncated\nFile position: 0x%" PRIx64, i, mcdFile.Tell());
m_valid = false; m_valid = false;
break; break;
} }

2
Source/Core/Core/HW/GCMemcardDirectory.cpp
View File

@ -85,7 +85,7 @@ int GCMemcardDirectory::LoadGCI(const std::string& fileName, DiscIO::IVolume::EC
u64 file_size = gcifile.GetSize(); u64 file_size = gcifile.GetSize();
if (file_size != size + DENTRY_SIZE) if (file_size != size + DENTRY_SIZE)
{ {
PanicAlertT("%s\nwas not loaded because it is an invalid GCI.\n File size (0x%llx" PanicAlertT("%s\nwas not loaded because it is an invalid GCI.\n File size (0x%" PRIx64
") does not match the size recorded in the header (0x%x)", ") does not match the size recorded in the header (0x%x)",
gci.m_filename.c_str(), file_size, size + DENTRY_SIZE); gci.m_filename.c_str(), file_size, size + DENTRY_SIZE);
return NO_INDEX; return NO_INDEX;

6
Source/Core/Core/HW/WiiSaveCrypted.cpp
View File

@ -88,7 +88,7 @@ void CWiiSaveCrypted::ExportAllSaves()
} }
} }
} }
SuccessAlertT("Found %u save files", (unsigned int)titles.size()); SuccessAlertT("Found %zu save files", titles.size());
u32 success = 0; u32 success = 0;
for (const u64& title : titles) for (const u64& title : titles)
{ {
@ -176,7 +176,7 @@ void CWiiSaveCrypted::ReadHDR()
md5((u8*)&m_header, HEADER_SZ, md5_calc); md5((u8*)&m_header, HEADER_SZ, md5_calc);
if (memcmp(md5_file, md5_calc, 0x10)) if (memcmp(md5_file, md5_calc, 0x10))
{ {
ERROR_LOG(CONSOLE, "MD5 mismatch\n %016llx%016llx != %016llx%016llx", ERROR_LOG(CONSOLE, "MD5 mismatch\n %016" PRIx64 "%016" PRIx64 " != %016" PRIx64 "%016" PRIx64,
Common::swap64(md5_file),Common::swap64(md5_file + 8), Common::swap64(md5_calc), Common::swap64(md5_file),Common::swap64(md5_file + 8), Common::swap64(md5_calc),
Common::swap64(md5_calc + 8)); Common::swap64(md5_calc + 8));
m_valid= false; m_valid= false;
@ -276,7 +276,7 @@ void CWiiSaveCrypted::ReadBKHDR()
} }
if (m_title_id != Common::swap64(m_bk_hdr.SaveGameTitle)) if (m_title_id != Common::swap64(m_bk_hdr.SaveGameTitle))
{ {
WARN_LOG(CONSOLE, "Encrypted title (%llx) does not match unencrypted title (%llx)", WARN_LOG(CONSOLE, "Encrypted title (%" PRIx64 ") does not match unencrypted title (%" PRIx64 ")",
m_title_id, Common::swap64(m_bk_hdr.SaveGameTitle)); m_title_id, Common::swap64(m_bk_hdr.SaveGameTitle));
} }
} }

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -162,7 +162,7 @@ IPCCommandResult CWII_IPC_HLE_Device_di::IOCtlV(u32 _CommandAddress)
u64 const partition_offset = ((u64)Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address + 4) << 2); u64 const partition_offset = ((u64)Memory::Read_U32(CommandBuffer.InBuffer[0].m_Address + 4) << 2);
DVDInterface::ChangePartition(partition_offset); DVDInterface::ChangePartition(partition_offset);
INFO_LOG(WII_IPC_DVD, "DVDLowOpenPartition: partition_offset 0x%016llx", partition_offset); INFO_LOG(WII_IPC_DVD, "DVDLowOpenPartition: partition_offset 0x%016" PRIx64, partition_offset);
// Read TMD to the buffer // Read TMD to the buffer
u32 tmd_size; u32 tmd_size;

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
View File

@ -211,7 +211,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
if (!Loader.IsValid()) if (!Loader.IsValid())
{ {
WARN_LOG(WII_IPC_ES, "ES: loader not valid for %llx", TitleID); WARN_LOG(WII_IPC_ES, "ES: loader not valid for %" PRIx64, TitleID);
return 0xffffffff; return 0xffffffff;
} }
@ -336,9 +336,7 @@ IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
else else
{ {
Memory::Write_U32((u32)rNANDCOntent.GetContentSize(), _CommandAddress + 0x4); Memory::Write_U32((u32)rNANDCOntent.GetContentSize(), _CommandAddress + 0x4);
INFO_LOG(WII_IPC_ES, INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTITLECONTENTS: Unable to open content %zu",
"IOCTL_ES_GETTITLECONTENTS: "
"Unable to open content %zu",
rNANDCOntent.GetContentSize()); rNANDCOntent.GetContentSize());
} }
@ -952,7 +950,7 @@ IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
if (!bSuccess) if (!bSuccess)
{ {
PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your NAND dump\n" PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload a title that is not available in your NAND dump\n"
"TitleID %016llx.\n Dolphin will likely hang now.", TitleID); "TitleID %016" PRIx64".\n Dolphin will likely hang now.", TitleID);
} }
else else
{ {
@ -993,7 +991,7 @@ IPCCommandResult CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
//TODO: provide correct return code when bSuccess= false //TODO: provide correct return code when bSuccess= false
Memory::Write_U32(0, _CommandAddress + 0x4); Memory::Write_U32(0, _CommandAddress + 0x4);
ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016llx %08x %016llx %08x %016llx %04x", TitleID,view,ticketid,devicetype,titleid,access); ERROR_LOG(WII_IPC_ES, "IOCTL_ES_LAUNCH %016" PRIx64 " %08x %016" PRIx64 " %08x %016" PRIx64 " %04x", TitleID,view,ticketid,devicetype,titleid,access);
// IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff // IOCTL_ES_LAUNCH 0001000248414341 00000001 0001c0fef3df2cfa 00000000 0001000248414341 ffff
// This is necessary because Reset(true) above deleted this object. Ew. // This is necessary because Reset(true) above deleted this object. Ew.

3
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -401,8 +401,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
} }
else // push new one, pop oldest else // push new one, pop oldest
{ {
DEBUG_LOG(WII_IPC_WIIMOTE, "HCI endpoint not " DEBUG_LOG(WII_IPC_WIIMOTE, "HCI endpoint not currently valid, queueing (%zu)...",
"currently valid, queueing (%zu)...",
m_EventQueue.size()); m_EventQueue.size());
m_EventQueue.push_back(_event); m_EventQueue.push_back(_event);
const SQueuedEvent& event = m_EventQueue.front(); const SQueuedEvent& event = m_EventQueue.front();

2
Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View File

@ -62,7 +62,7 @@ static void Trace(UGeckoInstruction& instCode)
std::string fregs = ""; std::string fregs = "";
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)
{ {
fregs += StringFromFormat("f%02d: %08llx %08llx ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]); fregs += StringFromFormat("f%02d: %08" PRIx64 " %08" PRIx64 " ", i, PowerPC::ppcState.ps[i][0], PowerPC::ppcState.ps[i][1]);
} }
std::string ppc_inst = GekkoDisassembler::Disassemble(instCode.hex, PC); std::string ppc_inst = GekkoDisassembler::Disassemble(instCode.hex, PC);

2
Source/Core/Core/PowerPC/Jit64/JitRegCache.h
View File

@ -103,7 +103,7 @@ public:
if (IsBound(preg)) if (IsBound(preg))
return regs[preg].location.GetSimpleReg(); return regs[preg].location.GetSimpleReg();
PanicAlert("Unbounded register - %zu", preg); PanicAlert("Unbound register - %zu", preg);
return Gen::INVALID_REG; return Gen::INVALID_REG;
} }
virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0; virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0;

4
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -216,14 +216,14 @@ namespace JitILProfiler
std::string filename = StringFromFormat("JitIL_profiling_%d.csv", (int)time(nullptr)); std::string filename = StringFromFormat("JitIL_profiling_%d.csv", (int)time(nullptr));
File::IOFile file(filename, "w"); File::IOFile file(filename, "w");
setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024); setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024);
fprintf(file.GetHandle(), "code hash, total elapsed, number of calls, elapsed per call\n"); fprintf(file.GetHandle(), "code hash,total elapsed,number of calls,elapsed per call\n");
for (auto& block : blocks) for (auto& block : blocks)
{ {
const u64 codeHash = block.codeHash; const u64 codeHash = block.codeHash;
const u64 totalElapsed = block.totalElapsed; const u64 totalElapsed = block.totalElapsed;
const u64 numberOfCalls = block.numberOfCalls; const u64 numberOfCalls = block.numberOfCalls;
const double elapsedPerCall = totalElapsed / (double)numberOfCalls; const double elapsedPerCall = totalElapsed / (double)numberOfCalls;
fprintf(file.GetHandle(), "%016llx, %lld, %lld, %f\n", codeHash, totalElapsed, numberOfCalls, elapsedPerCall); fprintf(file.GetHandle(), "%016" PRIx64 ",%" PRId64 ",%" PRId64 ",%f\n", codeHash, totalElapsed, numberOfCalls, elapsedPerCall);
} }
} }
}; };

2
Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
View File

@ -19,7 +19,7 @@ static void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress)
disasm.disasm64(0, code_addr, codePtr, disbuf); disasm.disasm64(0, code_addr, codePtr, disbuf);
PanicAlert("%s\n\n" PanicAlert("%s\n\n"
"Error encountered accessing emulated address %08x.\n" "Error encountered accessing emulated address %08x.\n"
"Culprit instruction: \n%s\nat %#llx", "Culprit instruction: \n%s\nat %#" PRIx64,
text.c_str(), emAddress, disbuf, code_addr); text.c_str(), emAddress, disbuf, code_addr);
return; return;
} }

2
Source/Core/Core/PowerPC/JitILCommon/IR.cpp
View File

@ -1513,7 +1513,7 @@ void IRBuilder::WriteToFile(u64 codeHash)
} }
FILE* const file = writer->file.GetHandle(); FILE* const file = writer->file.GetHandle();
fprintf(file, "\ncode hash:%016llx\n", codeHash); fprintf(file, "\ncode hash:%016" PRIx64 "\n", codeHash);
const InstLoc lastCurReadPtr = curReadPtr; const InstLoc lastCurReadPtr = curReadPtr;
StartForwardPass(); StartForwardPass();

2
Source/Core/Core/PowerPC/JitInterface.cpp
View File

@ -124,7 +124,7 @@ namespace JitInterface
std::string name = g_symbolDB.GetDescription(stat.addr); std::string name = g_symbolDB.GetDescription(stat.addr);
double percent = 100.0 * (double)stat.cost / (double)prof_stats.cost_sum; double percent = 100.0 * (double)stat.cost / (double)prof_stats.cost_sum;
double timePercent = 100.0 * (double)stat.tick_counter / (double)prof_stats.timecost_sum; double timePercent = 100.0 * (double)stat.tick_counter / (double)prof_stats.timecost_sum;
fprintf(f.GetHandle(), "%08x\t%s\t%llu\t%llu\t%llu\t%.2f\t%.2f\t%.2f\t%i\n", fprintf(f.GetHandle(), "%08x\t%s\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%.2f\t%.2f\t%.2f\t%i\n",
stat.addr, name.c_str(), stat.run_count, stat.cost, stat.addr, name.c_str(), stat.run_count, stat.cost,
stat.tick_counter, percent, timePercent, stat.tick_counter, percent, timePercent,
(double)stat.tick_counter*1000.0/(double)prof_stats.countsPerSec, stat.block_size); (double)stat.tick_counter*1000.0/(double)prof_stats.countsPerSec, stat.block_size);

6
Source/Core/Core/PowerPC/PPCTables.cpp
View File

@ -161,7 +161,7 @@ void PrintInstructionRunCounts()
if (inst.second == 0) if (inst.second == 0)
break; break;
DEBUG_LOG(POWERPC, "%s : %llu", inst.first, inst.second); DEBUG_LOG(POWERPC, "%s : %" PRIu64, inst.first, inst.second);
} }
} }
@ -175,7 +175,7 @@ void LogCompiledInstructions()
GekkoOPInfo *pInst = m_allInstructions[i]; GekkoOPInfo *pInst = m_allInstructions[i];
if (pInst->compileCount > 0) if (pInst->compileCount > 0)
{ {
fprintf(f.GetHandle(), "%s\t%i\t%lld\t%08x\n", pInst->opname, fprintf(f.GetHandle(), "%s\t%i\t%" PRId64 "\t%08x\n", pInst->opname,
pInst->compileCount, pInst->runCount, pInst->lastUse); pInst->compileCount, pInst->runCount, pInst->lastUse);
} }
} }
@ -186,7 +186,7 @@ void LogCompiledInstructions()
GekkoOPInfo *pInst = m_allInstructions[i]; GekkoOPInfo *pInst = m_allInstructions[i];
if (pInst->compileCount == 0) if (pInst->compileCount == 0)
{ {
fprintf(f.GetHandle(), "%s\t%i\t%lld\n", pInst->opname, fprintf(f.GetHandle(), "%s\t%i\t%" PRId64 "\n", pInst->opname,
pInst->compileCount, pInst->runCount); pInst->compileCount, pInst->runCount);
} }
} }

2
Source/Core/Core/ec_wii.cpp
View File

@ -133,7 +133,7 @@ EcWii::EcWii()
} }
else else
{ {
ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08X bytes.", (unsigned int) sizeof(BootMiiKeysBin)); ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08zX bytes.", sizeof(BootMiiKeysBin));
} }
} }
else else

4
Source/Core/DiscIO/CompressedBlob.cpp
View File

@ -108,7 +108,7 @@ void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
u32 block_hash = HashAdler32(source, comp_block_size); u32 block_hash = HashAdler32(source, comp_block_size);
if (block_hash != m_hashes[block_num]) if (block_hash != m_hashes[block_num])
PanicAlertT("The disc image \"%s\" is corrupt.\n" PanicAlertT("The disc image \"%s\" is corrupt.\n"
"Hash of block %llu is %08x instead of %08x.", "Hash of block %" PRIu64 " is %08x instead of %08x.",
m_file_name.c_str(), m_file_name.c_str(),
block_num, block_hash, m_hashes[block_num]); block_num, block_hash, m_hashes[block_num]);
@ -135,7 +135,7 @@ void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
{ {
// this seem to fire wrongly from time to time // this seem to fire wrongly from time to time
// to be sure, don't use compressed isos :P // to be sure, don't use compressed isos :P
PanicAlert("Failure reading block %llu - out of data and not at end.", block_num); PanicAlert("Failure reading block %" PRIu64 " - out of data and not at end.", block_num);
} }
inflateEnd(&z); inflateEnd(&z);
if (uncomp_size != m_header.block_size) if (uncomp_size != m_header.block_size)

6
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -130,14 +130,14 @@ size_t GetNextBlock(File::IOFile& in, u8* buffer)
size_t ReadBytes = 0; size_t ReadBytes = 0;
if (m_isScrubbing && m_FreeTable[i]) if (m_isScrubbing && m_FreeTable[i])
{ {
DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); DEBUG_LOG(DISCIO, "Freeing 0x%016" PRIx64, CurrentOffset);
std::fill(buffer, buffer + m_BlockSize, 0xFF); std::fill(buffer, buffer + m_BlockSize, 0xFF);
in.Seek(m_BlockSize, SEEK_CUR); in.Seek(m_BlockSize, SEEK_CUR);
ReadBytes = m_BlockSize; ReadBytes = m_BlockSize;
} }
else else
{ {
DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); DEBUG_LOG(DISCIO, "Used 0x%016" PRIx64, CurrentOffset);
in.ReadArray(buffer, m_BlockSize, &ReadBytes); in.ReadArray(buffer, m_BlockSize, &ReadBytes);
} }
@ -161,7 +161,7 @@ void MarkAsUsed(u64 _Offset, u64 _Size)
u64 CurrentOffset = _Offset; u64 CurrentOffset = _Offset;
u64 EndOffset = CurrentOffset + _Size; u64 EndOffset = CurrentOffset + _Size;
DEBUG_LOG(DISCIO, "Marking 0x%016llx - 0x%016llx as used", _Offset, EndOffset); DEBUG_LOG(DISCIO, "Marking 0x%016" PRIx64 " - 0x%016" PRIx64 " as used", _Offset, EndOffset);
while ((CurrentOffset < EndOffset) && (CurrentOffset < m_FileSize)) while ((CurrentOffset < EndOffset) && (CurrentOffset < m_FileSize))
{ {

2
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -77,7 +77,7 @@ u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64
u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile); u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile);
DEBUG_LOG(DISCIO, "Reading %llx bytes at %llx from file %s. Offset: %llx Size: %llx", DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 " Size: %" PRIx64,
read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize); read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize);
m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_Wii); m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_Wii);

4
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -229,13 +229,13 @@ bool CVolumeGC::LoadBannerFile() const
else else
{ {
m_banner_file_type = BANNER_INVALID; m_banner_file_type = BANNER_INVALID;
WARN_LOG(DISCIO, "Invalid opening.bnr. Type: %0x Size: %0lx", bannerSignature, (unsigned long)file_size); WARN_LOG(DISCIO, "Invalid opening.bnr. Type: %0x Size: %0zx", bannerSignature, file_size);
} }
} }
else else
{ {
m_banner_file_type = BANNER_INVALID; m_banner_file_type = BANNER_INVALID;
WARN_LOG(DISCIO, "Invalid opening.bnr. Size: %0lx", (unsigned long)file_size); WARN_LOG(DISCIO, "Invalid opening.bnr. Size: %0zx", file_size);
} }
return m_banner_file_type != BANNER_INVALID; return m_banner_file_type != BANNER_INVALID;

2
Source/Core/DolphinWX/Cheats/CheatsWindow.cpp
View File

@ -212,7 +212,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED(ev
ARCode code = GetARCode(i); ARCode code = GetARCode(i);
m_label_code_name->SetLabel(_("Name: ") + StrToWxStr(code.name)); m_label_code_name->SetLabel(_("Name: ") + StrToWxStr(code.name));
std::string numcodes = StringFromFormat("Number of Codes: %lu", (unsigned long)code.ops.size()); std::string numcodes = StringFromFormat("Number of Codes: %zu", code.ops.size());
m_label_num_codes->SetLabel(StrToWxStr(numcodes)); m_label_num_codes->SetLabel(StrToWxStr(numcodes));
m_listbox_codes_list->Clear(); m_listbox_codes_list->Clear();

2
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -206,7 +206,7 @@ std::string GameListItem::CreateCacheFilename()
// Filename.extension_HashOfFolderPath_Size.cache // Filename.extension_HashOfFolderPath_Size.cache
// Append hash to prevent ISO name-clashing in different folders. // Append hash to prevent ISO name-clashing in different folders.
Filename.append(StringFromFormat("%s_%x_%llx.cache", Filename.append(StringFromFormat("%s_%x_%" PRIx64 ".cache",
extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()), extension.c_str(), HashFletcher((const u8 *)LegalPathname.c_str(), LegalPathname.size()),
File::GetSize(m_FileName))); File::GetSize(m_FileName)));

2
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -112,7 +112,7 @@ CISOProperties::CISOProperties(const std::string& fileName, wxWindow* parent, wx
u8 game_id_bytes[8]; u8 game_id_bytes[8];
if (OpenISO->GetTitleID(game_id_bytes)) if (OpenISO->GetTitleID(game_id_bytes))
{ {
game_id = StringFromFormat("%016llx", Common::swap64(game_id_bytes)); game_id = StringFromFormat("%016" PRIx64, Common::swap64(game_id_bytes));
} }
} }

4
Source/Core/VideoCommon/Fifo.cpp
View File

@ -217,7 +217,7 @@ static void ReadDataFromFifo(u32 readPtr)
size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr; size_t existing_len = s_video_buffer_write_ptr - s_video_buffer_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len)) if (len > (size_t)(FIFO_SIZE - existing_len))
{ {
PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE); PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, (unsigned long) FIFO_SIZE);
return; return;
} }
memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len); memmove(s_video_buffer, s_video_buffer_read_ptr, existing_len);
@ -254,7 +254,7 @@ static void ReadDataFromFifoOnCPU(u32 readPtr)
size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr; size_t existing_len = write_ptr - s_video_buffer_pp_read_ptr;
if (len > (size_t)(FIFO_SIZE - existing_len)) if (len > (size_t)(FIFO_SIZE - existing_len))
{ {
PanicAlert("FIFO out of bounds (existing %lu + new %lu > %lu)", (unsigned long) existing_len, (unsigned long) len, (unsigned long) FIFO_SIZE); PanicAlert("FIFO out of bounds (existing %zu + new %zu > %lu)", existing_len, len, (unsigned long) FIFO_SIZE);
return; return;
} }
} }

4
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -259,8 +259,8 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
u64 tex_hash = XXH64(texture, texture_size, 0); u64 tex_hash = XXH64(texture, texture_size, 0);
u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0; u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016llx", width, height, has_mipmaps ? "_m" : "", tex_hash); std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height, has_mipmaps ? "_m" : "", tex_hash);
std::string tlutname = tlut_size ? StringFromFormat("_%016llx", tlut_hash) : ""; std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : "";
std::string formatname = StringFromFormat("_%d", format); std::string formatname = StringFromFormat("_%d", format);
std::string fullname = basename + tlutname + formatname; std::string fullname = basename + tlutname + formatname;

2
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -312,7 +312,7 @@ void Renderer::DrawDebugText()
if (SConfig::GetInstance().m_ShowLag) if (SConfig::GetInstance().m_ShowLag)
{ {
final_cyan += StringFromFormat("Lag: %llu\n", Movie::g_currentLagCount); final_cyan += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);
final_yellow += "\n"; final_yellow += "\n";
} }

2
Source/Core/VideoCommon/VertexLoaderBase.cpp
View File

@ -173,7 +173,7 @@ public:
if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride)) if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride))
ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data " ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data "
"(guru meditation 0x%016llx, 0x%08x, 0x%08x, 0x%08x).", "(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).",
m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex); m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex);
memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride); memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride);