diff options
| author |  darkf | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/core/arm/interpreter/thumbemu.cpp | |
| parent | Add comment regarding __WIN32__ in SkyEye code (diff) | |
| parent | Merge pull request #367 from bunnei/usat_ssat (diff) | |
| download | yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.gz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.xz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.zip | |
Fix merge conflicts
Diffstat (limited to 'src/core/arm/interpreter/thumbemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/thumbemu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/thumbemu.cpp b/src/core/arm/interpreter/thumbemu.cpp index f7f11f714..9cf80672d 100644 --- a/src/core/arm/interpreter/thumbemu.cpp +++ b/src/core/arm/interpreter/thumbemu.cpp | |||
| @@ -467,7 +467,7 @@ ARMul_ThumbDecode ( | |||
| 467 | (state->Reg[14] + ((tinstr & 0x07FF) << 1)) & 0xFFFFFFFC; | 467 | (state->Reg[14] + ((tinstr & 0x07FF) << 1)) & 0xFFFFFFFC; |
| 468 | state->Reg[14] = (tmp | 1); | 468 | state->Reg[14] = (tmp | 1); |
| 469 | CLEART; | 469 | CLEART; |
| 470 | DEBUG_LOG(ARM11, "In %s, After BLX(1),LR=0x%x,PC=0x%x, offset=0x%x\n", __FUNCTION__, state->Reg[14], state->Reg[15], (tinstr &0x7FF) << 1); | 470 | LOG_DEBUG(Core_ARM11, "After BLX(1),LR=0x%x,PC=0x%x, offset=0x%x", state->Reg[14], state->Reg[15], (tinstr &0x7FF) << 1); |
| 471 | valid = t_branch; | 471 | valid = t_branch; |
| 472 | FLUSHPIPE; | 472 | FLUSHPIPE; |
| 473 | } | 473 | } |