From bbabed8e98e573df5a566aa44f6a05147167b2a7 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Mon, 27 Apr 2015 21:59:06 -0400
Subject: Memory: Properly cleanup & shutdown.
---
src/core/mem_map_funcs.cpp | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
(limited to 'src/core/mem_map_funcs.cpp')
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 5878b99dc5..8759ebdfb3 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);
--
cgit v1.2.3-70-g09d2