diff --git a/src/common/cd_image_cue.cpp b/src/common/cd_image_cue.cpp index 4f12d5be2..7a22c8723 100644 --- a/src/common/cd_image_cue.cpp +++ b/src/common/cd_image_cue.cpp @@ -141,7 +141,7 @@ bool CDImageCueSheet::OpenAndParse(const char* filename) file_size /= track_sector_size; if (track_start >= file_size) { - Log_ErrorPrintf("Failed to open track %u in '%s': track start is out of range (%u vs %u)", track_num, filename, + Log_ErrorPrintf("Failed to open track %u in '%s': track start is out of range (%ld vs %ld)", track_num, filename, track_start, file_size); return false; } diff --git a/src/common/cd_image_memory.cpp b/src/common/cd_image_memory.cpp index 57711f2ee..1f8c281c5 100644 --- a/src/common/cd_image_memory.cpp +++ b/src/common/cd_image_memory.cpp @@ -81,7 +81,7 @@ bool CDImageMemory::CopyImage(CDImage* image, ProgressCallback* progress) { if (!image->ReadSectorFromIndex(memory_ptr, index, lba)) { - Log_ErrorPrintf("Failed to read LBA %u in index %u", lba, index); + Log_ErrorPrintf("Failed to read LBA %u in index %u", lba, i); return false; } diff --git a/src/common/gl/program.cpp b/src/common/gl/program.cpp index 7ad266f51..65bd6924e 100644 --- a/src/common/gl/program.cpp +++ b/src/common/gl/program.cpp @@ -159,7 +159,7 @@ bool Program::GetBinary(std::vector* out_data, u32* out_data_format) } else if (static_cast(binary_size) != out_data->size()) { - Log_WarningPrintf("Size changed from %zu to %d after glGetProgramBinary()", out_data->data(), binary_size); + Log_WarningPrintf("Size changed from %zu to %d after glGetProgramBinary()", out_data->size(), binary_size); out_data->resize(static_cast(binary_size)); } @@ -618,4 +618,4 @@ Program& Program::operator=(Program&& prog) return *this; } -} // namespace GL \ No newline at end of file +} // namespace GL diff --git a/src/common/wav_writer.cpp b/src/common/wav_writer.cpp index 5f51e9c30..124a186c7 100644 --- a/src/common/wav_writer.cpp +++ b/src/common/wav_writer.cpp @@ -85,7 +85,7 @@ void WAVWriter::WriteFrames(const s16* samples, u32 num_frames) const u32 num_frames_written = static_cast(std::fwrite(samples, sizeof(s16) * m_num_channels, num_frames, m_file)); if (num_frames_written != num_frames) - Log_ErrorPrintf("Only wrote %u of %u frames to output file", num_frames_written); + Log_ErrorPrintf("Only wrote %u of %u frames to output file", num_frames_written, num_frames); m_num_frames += num_frames_written; } @@ -112,4 +112,4 @@ bool WAVWriter::WriteHeader() return (std::fwrite(&header, sizeof(header), 1, m_file) == 1); } -} // namespace Common \ No newline at end of file +} // namespace Common diff --git a/src/core/bus.cpp b/src/core/bus.cpp index 1979a57aa..6757fc0b9 100644 --- a/src/core/bus.cpp +++ b/src/core/bus.cpp @@ -919,7 +919,7 @@ ALWAYS_INLINE static TickCount DoEXP3Access(u32 offset, u32& value) { if constexpr (type == MemoryAccessType::Read) { - Log_WarningPrintf("EXP3 read: 0x%08X -> 0x%08X", EXP3_BASE | offset); + Log_WarningPrintf("EXP3 read: 0x%08X -> 0x%08X", offset, EXP3_BASE | offset); value = UINT32_C(0xFFFFFFFF); return 0; diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index 63cdb624e..8fc178c33 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -1488,7 +1488,7 @@ void CheatCode::Apply() const } else { - Log_ErrorPrintf("Invalid command in second slide parameter 0x%02X", write_type); + Log_ErrorPrintf("Invalid command in second slide parameter 0x%02hhX", write_type); } index += 2; diff --git a/src/core/gpu_hw_opengl.cpp b/src/core/gpu_hw_opengl.cpp index 32f7ac393..367283092 100644 --- a/src/core/gpu_hw_opengl.cpp +++ b/src/core/gpu_hw_opengl.cpp @@ -341,7 +341,7 @@ void GPU_HW_OpenGL::SetCapabilities(HostDisplay* host_display) if (GLAD_GL_VERSION_4_3 || GLAD_GL_ES_VERSION_3_1 || GLAD_GL_ARB_shader_storage_buffer_object) glGetInteger64v(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_ssbo_size); - Log_InfoPrintf("Max shader storage buffer size: %u", max_ssbo_size); + Log_InfoPrintf("Max shader storage buffer size: %lld", max_ssbo_size); m_use_ssbo_for_vram_writes = (max_ssbo_size >= (VRAM_WIDTH * VRAM_HEIGHT * sizeof(u16))); if (m_use_ssbo_for_vram_writes) { diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index b78d119ae..a962f65ee 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -187,7 +187,7 @@ void HostInterface::ReportDebuggerMessage(const char* message) bool HostInterface::ConfirmMessage(const char* message) { - Log_WarningPrintf("ConfirmMessage(\"%s\") -> Yes"); + Log_WarningPrintf("ConfirmMessage(\"%s\") -> Yes", message); return true; } diff --git a/src/core/system.cpp b/src/core/system.cpp index 8221435da..a8c486ab1 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2086,7 +2086,7 @@ bool SaveRewindState() s_rewind_states.push_back(std::move(mss)); - Log_DevPrintf("Saved rewind state (%u bytes, took %.4f ms)", s_rewind_states.back().state_stream->GetSize(), + Log_DevPrintf("Saved rewind state (%llu bytes, took %.4f ms)", s_rewind_states.back().state_stream->GetSize(), save_timer.GetTimeMilliseconds()); return true; @@ -2245,4 +2245,4 @@ void SetRunaheadReplayFlag() s_runahead_replay_pending = true; } -} // namespace System \ No newline at end of file +} // namespace System diff --git a/src/core/timers.cpp b/src/core/timers.cpp index 81b7d37b8..743118e65 100644 --- a/src/core/timers.cpp +++ b/src/core/timers.cpp @@ -239,7 +239,7 @@ u32 Timers::ReadRegister(u32 offset) return cs.target; default: - Log_ErrorPrintf("Read unknown register in timer %u (offset 0x%02X)", offset); + Log_ErrorPrintf("Read unknown register in timer %u (offset 0x%02X)", timer_index, offset); return UINT32_C(0xFFFFFFFF); } } @@ -302,7 +302,7 @@ void Timers::WriteRegister(u32 offset, u32 value) break; default: - Log_ErrorPrintf("Write unknown register in timer %u (offset 0x%02X, value 0x%X)", offset, value); + Log_ErrorPrintf("Write unknown register in timer %u (offset 0x%02X, value 0x%X)", timer_index, offset, value); break; } } diff --git a/src/frontend-common/opengl_host_display.cpp b/src/frontend-common/opengl_host_display.cpp index f03b8df9f..79638dbdd 100644 --- a/src/frontend-common/opengl_host_display.cpp +++ b/src/frontend-common/opengl_host_display.cpp @@ -328,13 +328,13 @@ static void APIENTRY GLDebugCallback(GLenum source, GLenum type, GLuint id, GLen switch (severity) { case GL_DEBUG_SEVERITY_HIGH_KHR: - Log_ErrorPrintf(message); + Log_ErrorPrint(message); break; case GL_DEBUG_SEVERITY_MEDIUM_KHR: Log_WarningPrint(message); break; case GL_DEBUG_SEVERITY_LOW_KHR: - Log_InfoPrintf(message); + Log_InfoPrint(message); break; case GL_DEBUG_SEVERITY_NOTIFICATION: // Log_DebugPrint(message);