diff options
| author |  bunnei | 2018-05-11 12:59:23 -0400 |
|---|---|---|
| committer |  GitHub | 2018-05-11 12:59:23 -0400 |
| commit | 1b5c02fc37206bbd33715d2dde6258c3f835581c (patch) | |
| tree | 1c33c66e734ff55228e4293cd2720070cd467080 /src/core/arm | |
| parent | Merge pull request #439 from ogniK5377/GetTPCMasks (diff) | |
| parent | core: Add several missing docstrings. (diff) | |
| download | yuzu-1b5c02fc37206bbd33715d2dde6258c3f835581c.tar.gz yuzu-1b5c02fc37206bbd33715d2dde6258c3f835581c.tar.xz yuzu-1b5c02fc37206bbd33715d2dde6258c3f835581c.zip | |
Merge pull request #436 from bunnei/multi-core
Initial support for multi-core
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/unicorn/arm_unicorn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/unicorn/arm_unicorn.cpp b/src/core/arm/unicorn/arm_unicorn.cpp index 574922130..c0cc62f03 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp | |||
| @@ -52,7 +52,7 @@ static void InterruptHook(uc_engine* uc, u32 intNo, void* user_data) { | |||
| 52 | static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int size, u64 value, | 52 | static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int size, u64 value, |
| 53 | void* user_data) { | 53 | void* user_data) { |
| 54 | ARM_Interface::ThreadContext ctx{}; | 54 | ARM_Interface::ThreadContext ctx{}; |
| 55 | Core::CPU().SaveContext(ctx); | 55 | Core::CurrentArmInterface().SaveContext(ctx); |
| 56 | ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x{:X}, pc=0x{:X}, lr=0x{:X}", addr, | 56 | ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x{:X}, pc=0x{:X}, lr=0x{:X}", addr, |
| 57 | ctx.pc, ctx.cpu_registers[30]); | 57 | ctx.pc, ctx.cpu_registers[30]); |
| 58 | return {}; | 58 | return {}; |