diff options
| author |  bunnei | 2015-05-13 17:26:02 -0400 |
|---|---|---|
| committer | bunnei | 2015-05-13 17:26:02 -0400 |
| commit | 9e8b703b5e83d34c452b7c34af5be09755b3843f (patch) | |
| tree | d1d4b3751d707cd5ac4f2566b4c98cef44b1290b /src | |
| parent | Merge pull request #707 from linkmauve/freedesktop (diff) | |
| parent | dyncom: Fix decoding of BKPT's immediate (diff) | |
| download | yuzu-9e8b703b5e83d34c452b7c34af5be09755b3843f.tar.gz yuzu-9e8b703b5e83d34c452b7c34af5be09755b3843f.tar.xz yuzu-9e8b703b5e83d34c452b7c34af5be09755b3843f.zip | |
Merge pull request #765 from lioncash/bkpt
dyncom: Fix decoding of BKPT's immediate
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 315b4cc91..8c52bdb72 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -1393,7 +1393,7 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(bkpt)(unsigned int inst, int index) | |||
| 1393 | inst_base->br = NON_BRANCH; | 1393 | inst_base->br = NON_BRANCH; |
| 1394 | inst_base->load_r15 = 0; | 1394 | inst_base->load_r15 = 0; |
| 1395 | 1395 | ||
| 1396 | inst_cream->imm = BITS(inst, 8, 19) | BITS(inst, 0, 3); | 1396 | inst_cream->imm = (BITS(inst, 8, 19) << 4) | BITS(inst, 0, 3); |
| 1397 | 1397 | ||
| 1398 | return inst_base; | 1398 | return inst_base; |
| 1399 | } | 1399 | } |