N-archive/mikage-dev
1
0
Fork 0
mirror of https://github.com/mikage-emu/mikage-dev.git synced 2025-03-09 11:04:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use .Value() everywhere needed in format arguments

Browse source 
fmt 11 requires it.
This commit is contained in:
Emmanuel Gil Peyrot 2024-12-29 19:06:14 +01:00
parent 3f181d63b9
commit f27ab78177
4 changed files with 9 additions and 9 deletions
source
os.cpp
processes
dsp.cppfs.cpp
video_core/src/video_core
shader_microcode.cpp

10
source/os.cpp
View file

@ -1406,7 +1406,7 @@ void MemoryManager::TransferOwnership( std::shared_ptr<MemoryBlockOwner> old_ow
const uint32_t chunk_addr = block_it->first;
const uint32_t chunk_size = block_it->second.size_bytes;
fmt::print("Chunk: {:#x}-{:#x} (owner {})\n", chunk_addr, chunk_addr + chunk_size, fmt::ptr(block_it->second.owner.lock()));
fmt::print("Chunk: {:#x}-{:#x} (owner {})\n", chunk_addr, chunk_addr + chunk_size, fmt::ptr(block_it->second.owner.lock().get()));
ValidateContract(!block_it->second.owner.expired());
@ -3494,7 +3494,7 @@ void OS::TranslateIPCMessage(Thread& source, Thread& dest, bool is_reply) {
}
source.GetLogger()->info("{}Copying {}/{} bytes of static buffer data from {:#010x} to {:#010x} in thread {}:",
ThreadPrinter{source}, descriptor.static_buffer.size, dest_buffer_size, source_data_addr,
ThreadPrinter{source}, descriptor.static_buffer.size.Value(), dest_buffer_size, source_data_addr,
dest_buffer_addr, ThreadPrinter{dest});
std::string data;
auto max_size = std::min<uint32_t>(64, descriptor.static_buffer.size);
@ -3544,7 +3544,7 @@ void OS::TranslateIPCMessage(Thread& source, Thread& dest, bool is_reply) {
uint32_t static_buffer_offset = 0;
source.GetLogger()->info("{}Setting up PXI buffer table {:#x} at address {:#x} in target process",
ThreadPrinter{source}, descriptor.pxi_buffer.id, dest_buffer_addr);
ThreadPrinter{source}, descriptor.pxi_buffer.id.Value(), dest_buffer_addr);
auto base_physical_chunk = ResolveVirtualAddrWithSize(source.GetParentProcess(), buffer_address);
if (!base_physical_chunk) {
@ -3581,7 +3581,7 @@ void OS::TranslateIPCMessage(Thread& source, Thread& dest, bool is_reply) {
dest.WriteMemory32(dest_buffer_addr + static_buffer_offset + 4, buffer_size);
source.GetLogger()->info("Added PXI physical memory chunk {:#x} of size {:#x} in static buffer {} at {:#x}",
base_physical_chunk->first, buffer_size, descriptor.pxi_buffer.id, dest_buffer_addr + static_buffer_offset);
base_physical_chunk->first, buffer_size, descriptor.pxi_buffer.id.Value(), dest_buffer_addr + static_buffer_offset);
static_buffer_offset += 8;
@ -3613,7 +3613,7 @@ void OS::TranslateIPCMessage(Thread& source, Thread& dest, bool is_reply) {
dest.WriteMemory32(dest_buffer_addr + static_buffer_offset + 4, chunk_size);
source.GetLogger()->info("Added PXI physical memory chunk {:#x} of size {:#x} in static buffer {} at {:#x}",
physical_chunk_address, chunk_size, descriptor.pxi_buffer.id, dest_buffer_addr + static_buffer_offset);
physical_chunk_address, chunk_size, descriptor.pxi_buffer.id.Value(), dest_buffer_addr + static_buffer_offset);
static_buffer_offset += 8;

2
source/processes/dsp.cpp
View file

@ -785,7 +785,7 @@ void FakeDSP::OnIPCRequest(FakeThread& thread, Handle sender, const IPC::Command
default:
// TODO: Throw and catch IPCError instead
throw std::runtime_error(fmt::format("Unknown DSP IPC request {:#x}", header.command_id));
throw std::runtime_error(fmt::format("Unknown DSP IPC request {:#x}", header.command_id.Value()));
}
}

4
source/processes/fs.cpp
View file

@ -1818,7 +1818,7 @@ static decltype(HLE::OS::ServiceHelper::SendReply) OnFileIPCRequest(FakeThread&
return HLE::OS::ServiceHelper::SendReply;
} catch (std::ios_base::failure& err) {
thread.GetLogger()->error("Unexpected fstream exception in File IPC command {:#x} handled via object {}: {}",
header.command_id, boost::core::demangle(typeid(*file).name()),
header.command_id.Value(), boost::core::demangle(typeid(*file).name()),
IosExceptionInfo(err));
throw;
}
@ -1860,7 +1860,7 @@ static decltype(HLE::OS::ServiceHelper::SendReply) OnDirIPCRequest(FakeThread& t
return HLE::OS::ServiceHelper::SendReply;
} catch (std::ios_base::failure& err) {
thread.GetLogger()->error("Unexpected fstream exception in Directory IPC command {:#x} handled via object {}: {}",
header.command_id, boost::core::demangle(typeid(dir).name()),
header.command_id.Value(), boost::core::demangle(typeid(dir).name()),
IosExceptionInfo(err));
throw;
}

2
source/video_core/src/video_core/shader_microcode.cpp
View file

@ -1554,7 +1554,7 @@ std::unique_ptr<ShaderEngine> CreateMicroCodeRecompiler(Context& context) try {
auto vis = VisualizeShaderControlFlowGraph(prog, context.shader_memory.data(), context.shader_memory.size(),
context.swizzle_data.data(), context.swizzle_data.size());
// std::cerr << vis << "\n";
throw std::runtime_error(fmt::format("OMG: {:#x}", context.registers.vs_main_offset));
throw std::runtime_error(fmt::format("OMG: {:#x}", context.registers.vs_main_offset.Value()));
}
} // namespace Pica::VertexShader