diff options
| author |  bunnei | 2015-02-12 23:18:40 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-12 23:18:40 -0500 |
| commit | 9b69079c835352fd7727e89624accb5115d35d36 (patch) | |
| tree | 9b1f0a7cf06bde6cbaac3230fbdbba824e7fcdfc /src/core/core.cpp | |
| parent | Merge pull request #568 from lioncash/assert (diff) | |
| parent | dyncom: Switch the app and system cores into the correct mode at initialization (diff) | |
| download | yuzu-9b69079c835352fd7727e89624accb5115d35d36.tar.gz yuzu-9b69079c835352fd7727e89624accb5115d35d36.tar.xz yuzu-9b69079c835352fd7727e89624accb5115d35d36.zip | |
Merge pull request #569 from lioncash/modeswitch
Dyncom: Correctly set the ARM modes on dyncom initialization.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 63be27be2..15787bc17 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -56,11 +56,10 @@ void Stop() { | |||
| 56 | 56 | ||
| 57 | /// Initialize the core | 57 | /// Initialize the core |
| 58 | int Init() { | 58 | int Init() { |
| 59 | LOG_DEBUG(Core, "initialized OK"); | 59 | g_sys_core = new ARM_DynCom(USER32MODE); |
| 60 | 60 | g_app_core = new ARM_DynCom(USER32MODE); | |
| 61 | g_sys_core = new ARM_DynCom(); | ||
| 62 | g_app_core = new ARM_DynCom(); | ||
| 63 | 61 | ||
| 62 | LOG_DEBUG(Core, "Initialized OK"); | ||
| 64 | return 0; | 63 | return 0; |
| 65 | } | 64 | } |
| 66 | 65 | ||
| @@ -68,7 +67,7 @@ void Shutdown() { | |||
| 68 | delete g_app_core; | 67 | delete g_app_core; |
| 69 | delete g_sys_core; | 68 | delete g_sys_core; |
| 70 | 69 | ||
| 71 | LOG_DEBUG(Core, "shutdown OK"); | 70 | LOG_DEBUG(Core, "Shutdown OK"); |
| 72 | } | 71 | } |
| 73 | 72 | ||
| 74 | } // namespace | 73 | } // namespace |