diff options
| author |  bunnei | 2018-03-19 16:29:03 -0400 |
|---|---|---|
| committer |  GitHub | 2018-03-19 16:29:03 -0400 |
| commit | a90ab1dec7b4b4cefc73115310dec57363114a05 (patch) | |
| tree | 45ebd96f672851f816aca4b09b599df5ee8f8c5c /src/core/arm | |
| parent | Merge pull request #251 from Subv/tic_tsc (diff) | |
| parent | Clang Fixes (diff) | |
| download | yuzu-a90ab1dec7b4b4cefc73115310dec57363114a05.tar.gz yuzu-a90ab1dec7b4b4cefc73115310dec57363114a05.tar.xz yuzu-a90ab1dec7b4b4cefc73115310dec57363114a05.zip | |
Merge pull request #252 from N00byKing/3064
Implement Pull #3064 from citra: Clean all format warnings (Yuzu-specific format warnings cleared too)
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 bd98cb160..b0cdc2403 100644 --- a/src/core/arm/unicorn/arm_unicorn.cpp +++ b/src/core/arm/unicorn/arm_unicorn.cpp | |||
| @@ -53,7 +53,7 @@ static bool UnmappedMemoryHook(uc_engine* uc, uc_mem_type type, u64 addr, int si | |||
| 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::CPU().SaveContext(ctx); |
| 56 | ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x%llx, pc=0x%llx, lr=0x%llx", addr, | 56 | ASSERT_MSG(false, "Attempted to read from unmapped memory: 0x%lx, pc=0x%lx, lr=0x%lx", addr, |
| 57 | ctx.pc, ctx.cpu_registers[30]); | 57 | ctx.pc, ctx.cpu_registers[30]); |
| 58 | return {}; | 58 | return {}; |
| 59 | } | 59 | } |