diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/arm_interface.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 2 | ||||
| -rw-r--r-- | src/core/settings.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index be677ae20..4b93d3313 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h | |||
| @@ -16,7 +16,7 @@ public: | |||
| 16 | num_instructions = 0; | 16 | num_instructions = 0; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | ~ARM_Interface() { | 19 | virtual ~ARM_Interface() { |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 6bd5e2728..f538c6550 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp | |||
| @@ -72,7 +72,7 @@ Result MapSharedMemory(u32 handle, u32 address, MemoryPermission permissions, | |||
| 72 | 72 | ||
| 73 | if (address < Memory::SHARED_MEMORY_VADDR || address >= Memory::SHARED_MEMORY_VADDR_END) { | 73 | if (address < Memory::SHARED_MEMORY_VADDR || address >= Memory::SHARED_MEMORY_VADDR_END) { |
| 74 | ERROR_LOG(KERNEL, "cannot map handle=0x%08X, address=0x%08X outside of shared mem bounds!", | 74 | ERROR_LOG(KERNEL, "cannot map handle=0x%08X, address=0x%08X outside of shared mem bounds!", |
| 75 | handle); | 75 | handle, address); |
| 76 | return -1; | 76 | return -1; |
| 77 | } | 77 | } |
| 78 | SharedMemory* shared_memory = Kernel::g_object_pool.GetFast<SharedMemory>(handle); | 78 | SharedMemory* shared_memory = Kernel::g_object_pool.GetFast<SharedMemory>(handle); |
diff --git a/src/core/settings.h b/src/core/settings.h index 6a6265e18..7e7a66b89 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -32,6 +32,8 @@ struct Values { | |||
| 32 | 32 | ||
| 33 | // Data Storage | 33 | // Data Storage |
| 34 | bool use_virtual_sd; | 34 | bool use_virtual_sd; |
| 35 | |||
| 36 | bool enable_log; | ||
| 35 | } extern values; | 37 | } extern values; |
| 36 | 38 | ||
| 37 | } | 39 | } |