diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-31 09:24:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 09:24:13 -0700 |
| commit | 3575c076cb12db611c5d252bd647a236b789f53f (patch) | |
| tree | aa2d9a1086132095a9f50749920288dcb1e279ad /src/video_core/macro_interpreter.cpp | |
| parent | fd020ad52ae3dc511527b0f26aab198484dac2dc (diff) | |
| parent | 8191273a3de6df8531805fbfb1a9b6e5a18076a2 (diff) | |
Merge pull request #869 from Subv/ubsan
Corrected a few error cases detected by asan/ubsan
Diffstat (limited to 'src/video_core/macro_interpreter.cpp')
| -rw-r--r-- | src/video_core/macro_interpreter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 44ece01c1..377bd66ab 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp @@ -102,11 +102,11 @@ bool MacroInterpreter::Step(const std::vector<u32>& code, bool is_delay_slot) { if (taken) { // Ignore the delay slot if the branch has the annul bit. if (opcode.branch_annul) { - pc = base_address + (opcode.immediate << 2); + pc = base_address + opcode.GetBranchTarget(); return true; } - delayed_pc = base_address + (opcode.immediate << 2); + delayed_pc = base_address + opcode.GetBranchTarget(); // Execute one more instruction due to the delay slot. return Step(code, true); } |
