summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2018-02-13 21:41:20 -0500
committerGravatar bunnei2018-02-13 23:26:03 -0500
commit1ce6fff0648008b7510e9feb3cf6696a2c25dd5c (patch)
tree879c69e708657d93a3c69717ae989350894ca285 /src/core/hle/kernel
parentvi: Fix TransactParcelAuto to support both buffer formats. (diff)
downloadyuzu-1ce6fff0648008b7510e9feb3cf6696a2c25dd5c.tar.gz
yuzu-1ce6fff0648008b7510e9feb3cf6696a2c25dd5c.tar.xz
yuzu-1ce6fff0648008b7510e9feb3cf6696a2c25dd5c.zip
hle_ipc: Add helper functions for reading and writing buffers.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp39
-rw-r--r--src/core/hle/kernel/hle_ipc.h12
2 files changed, 51 insertions, 0 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index db104e8a2..a5a3d4fe4 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -12,6 +12,7 @@
12#include "core/hle/kernel/kernel.h" 12#include "core/hle/kernel/kernel.h"
13#include "core/hle/kernel/process.h" 13#include "core/hle/kernel/process.h"
14#include "core/hle/kernel/server_session.h" 14#include "core/hle/kernel/server_session.h"
15#include "core/memory.h"
15 16
16namespace Kernel { 17namespace Kernel {
17 18
@@ -210,4 +211,42 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P
210 return RESULT_SUCCESS; 211 return RESULT_SUCCESS;
211} 212}
212 213
214std::vector<u8> HLERequestContext::ReadBuffer() const {
215 std::vector<u8> buffer;
216 const bool is_buffer_a{BufferDescriptorA().size() && BufferDescriptorA()[0].Size()};
217
218 if (is_buffer_a) {
219 buffer.resize(BufferDescriptorA()[0].Size());
220 Memory::ReadBlock(BufferDescriptorA()[0].Address(), buffer.data(), buffer.size());
221 } else {
222 buffer.resize(BufferDescriptorX()[0].Size());
223 Memory::ReadBlock(BufferDescriptorX()[0].Address(), buffer.data(), buffer.size());
224 }
225
226 return buffer;
227}
228
229size_t HLERequestContext::WriteBuffer(const void* buffer, const size_t size) const {
230 const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()};
231
232 if (is_buffer_b) {
233 const size_t size{std::min(BufferDescriptorB()[0].Size(), size)};
234 Memory::WriteBlock(BufferDescriptorB()[0].Address(), buffer, size);
235 return size;
236 } else {
237 const size_t size{std::min(BufferDescriptorC()[0].Size(), size)};
238 Memory::WriteBlock(BufferDescriptorC()[0].Address(), buffer, size);
239 return size;
240 }
241}
242
243size_t HLERequestContext::WriteBuffer(const std::vector<u8>& buffer) const {
244 return WriteBuffer(buffer.data(), buffer.size());
245}
246
247size_t HLERequestContext::GetWriteBufferSize() const {
248 const bool is_buffer_b{BufferDescriptorB().size() && BufferDescriptorB()[0].Size()};
249 return is_buffer_b ? BufferDescriptorB()[0].Size() : BufferDescriptorC()[0].Size();
250}
251
213} // namespace Kernel 252} // namespace Kernel
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index da8335b35..0cc270909 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -143,6 +143,18 @@ public:
143 return domain_message_header; 143 return domain_message_header;
144 } 144 }
145 145
146 /// Helper function to read a buffer using the appropriate buffer descriptor
147 std::vector<u8> ReadBuffer() const;
148
149 /// Helper function to write a buffer using the appropriate buffer descriptor
150 size_t WriteBuffer(const void* buffer, const size_t size) const;
151
152 /// Helper function to write a buffer using the appropriate buffer descriptor
153 size_t WriteBuffer(const std::vector<u8>& buffer) const;
154
155 /// Helper function to get the size of the output buffer
156 size_t GetWriteBufferSize() const;
157
146 template <typename T> 158 template <typename T>
147 SharedPtr<T> GetCopyObject(size_t index) { 159 SharedPtr<T> GetCopyObject(size_t index) {
148 ASSERT(index < copy_objects.size()); 160 ASSERT(index < copy_objects.size());