diff options
| author |  Yuri Kunde Schlesner | 2015-08-22 14:01:57 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-08-22 14:01:57 -0700 |
| commit | 3efb205a68d38fe377b2c27349d91ec4c6a2d390 (patch) | |
| tree | 4326d8394e66fec3831ce6b9851da689e5aa78e8 /src/core/arm | |
| parent | Merge pull request #1056 from lioncash/emitter (diff) | |
| parent | Kernel: Remove unused legacy heap MapBlock_* functions (diff) | |
| download | yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.tar.gz yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.tar.xz yuzu-3efb205a68d38fe377b2c27349d91ec4c6a2d390.zip | |
Merge pull request #1025 from yuriks/heap-management
Kernel: Correct(er) handling of Heap and Linear Heap allocations
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/skyeye_common/armstate.cpp | 1 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armsupp.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/core/arm/skyeye_common/armstate.cpp b/src/core/arm/skyeye_common/armstate.cpp index ccb2eb0eb..0491717dc 100644 --- a/src/core/arm/skyeye_common/armstate.cpp +++ b/src/core/arm/skyeye_common/armstate.cpp | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | #include "common/swap.h" | 5 | #include "common/swap.h" |
| 6 | #include "common/logging/log.h" | 6 | #include "common/logging/log.h" |
| 7 | #include "core/mem_map.h" | ||
| 8 | #include "core/memory.h" | 7 | #include "core/memory.h" |
| 9 | #include "core/arm/skyeye_common/armstate.h" | 8 | #include "core/arm/skyeye_common/armstate.h" |
| 10 | #include "core/arm/skyeye_common/vfp/vfp.h" | 9 | #include "core/arm/skyeye_common/vfp/vfp.h" |
diff --git a/src/core/arm/skyeye_common/armsupp.cpp b/src/core/arm/skyeye_common/armsupp.cpp index d31fb9449..883713e86 100644 --- a/src/core/arm/skyeye_common/armsupp.cpp +++ b/src/core/arm/skyeye_common/armsupp.cpp | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | #include "common/logging/log.h" | 18 | #include "common/logging/log.h" |
| 19 | 19 | ||
| 20 | #include "core/mem_map.h" | ||
| 21 | #include "core/arm/skyeye_common/arm_regformat.h" | 20 | #include "core/arm/skyeye_common/arm_regformat.h" |
| 22 | #include "core/arm/skyeye_common/armstate.h" | 21 | #include "core/arm/skyeye_common/armstate.h" |
| 23 | #include "core/arm/skyeye_common/armsupp.h" | 22 | #include "core/arm/skyeye_common/armsupp.h" |