summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map_funcs.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-04-28 03:59:06 +0200
committerbunnei <bunneidev@gmail.com>2015-05-02 00:27:01 +0200
commitbbabed8e98e573df5a566aa44f6a05147167b2a7 (patch)
tree4b3888a936bd38929815d56a93aa957c569f806b /src/core/mem_map_funcs.cpp
parentQt: Create emu thread on bootup, kill it on shutdown. (diff)
downloadyuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar.gz
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar.bz2
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar.lz
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar.xz
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.tar.zst
yuzu-bbabed8e98e573df5a566aa44f6a05147167b2a7.zip
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
-rw-r--r--src/core/mem_map_funcs.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 5878b99dc..8759ebdfb 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -15,7 +15,6 @@ namespace Memory {
static std::map<u32, MemoryBlock> heap_map;
static std::map<u32, MemoryBlock> heap_linear_map;
-static std::map<u32, MemoryBlock> shared_map;
/// Convert a physical address to virtual address
VAddr PhysicalToVirtualAddress(const PAddr addr) {
@@ -185,12 +184,6 @@ u8 *GetPointer(const VAddr vaddr) {
}
}
-/**
- * Maps a block of memory on the heap
- * @param size Size of block in bytes
- * @param operation Memory map operation type
- * @param flags Memory allocation flags
- */
u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions) {
MemoryBlock block;
@@ -208,12 +201,6 @@ u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions) {
return block.GetVirtualAddress();
}
-/**
- * Maps a block of memory on the linear heap
- * @param size Size of block in bytes
- * @param operation Memory map operation type
- * @param flags Memory allocation flags
- */
u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions) {
MemoryBlock block;
@@ -231,6 +218,14 @@ u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions) {
return block.GetVirtualAddress();
}
+void MemBlock_Init() {
+}
+
+void MemBlock_Shutdown() {
+ heap_map.clear();
+ heap_linear_map.clear();
+}
+
u8 Read8(const VAddr addr) {
u8 data = 0;
Read<u8>(data, addr);