citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

arm_dyncom_thumb: Fix encoding of BKPT's immediate

This commit is contained in:
Lioncash 2015-05-31 05:48:00 -04:00
parent 85b1dddda1
commit c00781a908
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/arm/dyncom/arm_dyncom_thumb.cpp
View File

@ -275,7 +275,10 @@ tdstate thumb_translate(u32 addr, u32 instr, u32* ainstr, u32* inst_size) {
: 0xE28DDF00) // ADD : 0xE28DDF00) // ADD
|(tinstr & 0x007F); // off7 |(tinstr & 0x007F); // off7
} else if ((tinstr & 0x0F00) == 0x0e00) { } else if ((tinstr & 0x0F00) == 0x0e00) {
*ainstr = 0xEF000000 | 0x180000; // base | BKPT mask // BKPT
*ainstr = 0xEF000000 // base
| BITS(tinstr, 0, 3) // imm4 field;
| (BITS(tinstr, 4, 7) << 8); // beginning 4 bits of imm12
} else if ((tinstr & 0x0F00) == 0x0200) { } else if ((tinstr & 0x0F00) == 0x0200) {
static const ARMword subset[4] = { static const ARMword subset[4] = {
0xE6BF0070, // SXTH 0xE6BF0070, // SXTH