diff options
| author | 2020-04-08 13:34:59 -0400 | |
|---|---|---|
| committer | 2020-04-08 13:40:46 -0400 | |
| commit | 913f42a3a70d716fa65d639dc4a6dfc9687eec61 (patch) | |
| tree | 9f95aba901fa11f748f54bcaa39e6c87ff08c802 /src/core | |
| parent | GPUMemoryManager: Improve safety of memory reads. (diff) | |
| download | yuzu-913f42a3a70d716fa65d639dc4a6dfc9687eec61.tar.gz yuzu-913f42a3a70d716fa65d639dc4a6dfc9687eec61.tar.xz yuzu-913f42a3a70d716fa65d639dc4a6dfc9687eec61.zip | |
Memory: Address Feedback.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/memory.h | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index 97750f851..b92d678a4 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -294,6 +294,24 @@ public: | |||
| 294 | void ReadBlock(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, | 294 | void ReadBlock(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, |
| 295 | std::size_t size); | 295 | std::size_t size); |
| 296 | 296 | ||
| 297 | /** | ||
| 298 | * Reads a contiguous block of bytes from a specified process' address space. | ||
| 299 | * This unsafe version does not trigger GPU flushing. | ||
| 300 | * | ||
| 301 | * @param process The process to read the data from. | ||
| 302 | * @param src_addr The virtual address to begin reading from. | ||
| 303 | * @param dest_buffer The buffer to place the read bytes into. | ||
| 304 | * @param size The amount of data to read, in bytes. | ||
| 305 | * | ||
| 306 | * @note If a size of 0 is specified, then this function reads nothing and | ||
| 307 | * no attempts to access memory are made at all. | ||
| 308 | * | ||
| 309 | * @pre dest_buffer must be at least size bytes in length, otherwise a | ||
| 310 | * buffer overrun will occur. | ||
| 311 | * | ||
| 312 | * @post The range [dest_buffer, size) contains the read bytes from the | ||
| 313 | * process' address space. | ||
| 314 | */ | ||
| 297 | void ReadBlockUnsafe(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, | 315 | void ReadBlockUnsafe(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, |
| 298 | std::size_t size); | 316 | std::size_t size); |
| 299 | 317 | ||
| @@ -315,6 +333,23 @@ public: | |||
| 315 | */ | 333 | */ |
| 316 | void ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size); | 334 | void ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size); |
| 317 | 335 | ||
| 336 | /** | ||
| 337 | * Reads a contiguous block of bytes from the current process' address space. | ||
| 338 | * This unsafe version does not trigger GPU flushing. | ||
| 339 | * | ||
| 340 | * @param src_addr The virtual address to begin reading from. | ||
| 341 | * @param dest_buffer The buffer to place the read bytes into. | ||
| 342 | * @param size The amount of data to read, in bytes. | ||
| 343 | * | ||
| 344 | * @note If a size of 0 is specified, then this function reads nothing and | ||
| 345 | * no attempts to access memory are made at all. | ||
| 346 | * | ||
| 347 | * @pre dest_buffer must be at least size bytes in length, otherwise a | ||
| 348 | * buffer overrun will occur. | ||
| 349 | * | ||
| 350 | * @post The range [dest_buffer, size) contains the read bytes from the | ||
| 351 | * current process' address space. | ||
| 352 | */ | ||
| 318 | void ReadBlockUnsafe(VAddr src_addr, void* dest_buffer, std::size_t size); | 353 | void ReadBlockUnsafe(VAddr src_addr, void* dest_buffer, std::size_t size); |
| 319 | 354 | ||
| 320 | /** | 355 | /** |
| @@ -340,6 +375,23 @@ public: | |||
| 340 | void WriteBlock(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, | 375 | void WriteBlock(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, |
| 341 | std::size_t size); | 376 | std::size_t size); |
| 342 | 377 | ||
| 378 | /** | ||
| 379 | * Writes a range of bytes into a given process' address space at the specified | ||
| 380 | * virtual address. | ||
| 381 | * This unsafe version does not invalidate GPU Memory. | ||
| 382 | * | ||
| 383 | * @param process The process to write data into the address space of. | ||
| 384 | * @param dest_addr The destination virtual address to begin writing the data at. | ||
| 385 | * @param src_buffer The data to write into the process' address space. | ||
| 386 | * @param size The size of the data to write, in bytes. | ||
| 387 | * | ||
| 388 | * @post The address range [dest_addr, size) in the process' address space | ||
| 389 | * contains the data that was within src_buffer. | ||
| 390 | * | ||
| 391 | * @post If an attempt is made to write into an unmapped region of memory, the writes | ||
| 392 | * will be ignored and an error will be logged. | ||
| 393 | * | ||
| 394 | */ | ||
| 343 | void WriteBlockUnsafe(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, | 395 | void WriteBlockUnsafe(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, |
| 344 | std::size_t size); | 396 | std::size_t size); |
| 345 | 397 | ||
| @@ -364,6 +416,22 @@ public: | |||
| 364 | */ | 416 | */ |
| 365 | void WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size); | 417 | void WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size); |
| 366 | 418 | ||
| 419 | /** | ||
| 420 | * Writes a range of bytes into the current process' address space at the specified | ||
| 421 | * virtual address. | ||
| 422 | * This unsafe version does not invalidate GPU Memory. | ||
| 423 | * | ||
| 424 | * @param dest_addr The destination virtual address to begin writing the data at. | ||
| 425 | * @param src_buffer The data to write into the current process' address space. | ||
| 426 | * @param size The size of the data to write, in bytes. | ||
| 427 | * | ||
| 428 | * @post The address range [dest_addr, size) in the current process' address space | ||
| 429 | * contains the data that was within src_buffer. | ||
| 430 | * | ||
| 431 | * @post If an attempt is made to write into an unmapped region of memory, the writes | ||
| 432 | * will be ignored and an error will be logged. | ||
| 433 | * | ||
| 434 | */ | ||
| 367 | void WriteBlockUnsafe(VAddr dest_addr, const void* src_buffer, std::size_t size); | 435 | void WriteBlockUnsafe(VAddr dest_addr, const void* src_buffer, std::size_t size); |
| 368 | 436 | ||
| 369 | /** | 437 | /** |