|
|
@ -326,26 +326,24 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer(KThread& requesting_threa |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const { |
|
|
std::vector<u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const { |
|
|
std::vector<u8> buffer{}; |
|
|
|
|
|
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && |
|
|
const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && |
|
|
BufferDescriptorA()[buffer_index].Size()}; |
|
|
BufferDescriptorA()[buffer_index].Size()}; |
|
|
|
|
|
|
|
|
if (is_buffer_a) { |
|
|
if (is_buffer_a) { |
|
|
ASSERT_OR_EXECUTE_MSG( |
|
|
ASSERT_OR_EXECUTE_MSG( |
|
|
BufferDescriptorA().size() > buffer_index, { return buffer; }, |
|
|
|
|
|
|
|
|
BufferDescriptorA().size() > buffer_index, { return {}; }, |
|
|
"BufferDescriptorA invalid buffer_index {}", buffer_index); |
|
|
"BufferDescriptorA invalid buffer_index {}", buffer_index); |
|
|
buffer.resize(BufferDescriptorA()[buffer_index].Size()); |
|
|
|
|
|
|
|
|
std::vector<u8> buffer(BufferDescriptorA()[buffer_index].Size()); |
|
|
memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), buffer.data(), buffer.size()); |
|
|
memory.ReadBlock(BufferDescriptorA()[buffer_index].Address(), buffer.data(), buffer.size()); |
|
|
|
|
|
return buffer; |
|
|
} else { |
|
|
} else { |
|
|
ASSERT_OR_EXECUTE_MSG( |
|
|
ASSERT_OR_EXECUTE_MSG( |
|
|
BufferDescriptorX().size() > buffer_index, { return buffer; }, |
|
|
|
|
|
|
|
|
BufferDescriptorX().size() > buffer_index, { return {}; }, |
|
|
"BufferDescriptorX invalid buffer_index {}", buffer_index); |
|
|
"BufferDescriptorX invalid buffer_index {}", buffer_index); |
|
|
buffer.resize(BufferDescriptorX()[buffer_index].Size()); |
|
|
|
|
|
|
|
|
std::vector<u8> buffer(BufferDescriptorX()[buffer_index].Size()); |
|
|
memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), buffer.data(), buffer.size()); |
|
|
memory.ReadBlock(BufferDescriptorX()[buffer_index].Address(), buffer.data(), buffer.size()); |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return buffer; |
|
|
return buffer; |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
std::size_t HLERequestContext::WriteBuffer(const void* buffer, std::size_t size, |
|
|
std::size_t HLERequestContext::WriteBuffer(const void* buffer, std::size_t size, |
|
|
std::size_t buffer_index) const { |
|
|
std::size_t buffer_index) const { |
|
|
|