diff options
| author | bunnei <bunneidev@gmail.com> | 2015-04-06 21:06:07 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-04-06 21:06:07 +0200 |
| commit | 14dcd986535c681601d6f255899157aff021a5d2 (patch) | |
| tree | fb35f0b8444122438dcdf41b4a3b0bf32e4d7d29 /src/core/core.cpp | |
| parent | Merge pull request #684 from lioncash/uninit (diff) | |
| parent | core: Migrate 3DS-specific CP15 register setting into Init (diff) | |
| download | yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar.gz yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar.bz2 yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar.lz yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar.xz yuzu-14dcd986535c681601d6f255899157aff021a5d2.tar.zst yuzu-14dcd986535c681601d6f255899157aff021a5d2.zip | |
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 15787bc17..81e642318 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -7,6 +7,7 @@ #include "core/core.h" #include "core/core_timing.h" +#include "core/mem_map.h" #include "core/settings.h" #include "core/arm/arm_interface.h" #include "core/arm/disassembler/arm_disasm.h" @@ -59,6 +60,10 @@ int Init() { g_sys_core = new ARM_DynCom(USER32MODE); g_app_core = new ARM_DynCom(USER32MODE); + // TODO: Whenever TLS is implemented, this should contain + // the address of the 0x200-byte TLS + g_app_core->SetCP15Register(CP15_THREAD_URO, Memory::KERNEL_MEMORY_VADDR); + LOG_DEBUG(Core, "Initialized OK"); return 0; } |