691c691,699
< bkptCode = 'return std::make_shared<PrefetchAbort>(PC, ArmFault::DebugEvent);\n'
---
> bkptCode = '''
> uint16_t imm16;
> if (!machInst.thumb)
> imm16 = ((bits(machInst, 19, 8) << 4) | bits(machInst, 3, 0));
> else
> imm16 = bits(machInst, 7, 0);
>
> return softwareBreakpoint32(xc, imm16);
> '''