72,77d71
< // Other than the assert below, jBit isn't used.
< #if !defined(NDEBUG)
< Addr jBit = PC & (ULL(1) << PcJBitShift);
< #endif
< // X isn't permitted in ThumbEE mode. We shouldn't be in jazzelle mode?
< assert(!jBit);
80d73
< Addr tempPc = ((%(newPC)s) & mask(32)) | (PC & ~mask(32));
92,96d84
< if imm and link: #blx with imm
< branchStr = "FNPC = tempPc ^ (ULL(1) << PcTBitShift);"
< else:
< branchStr = "IWNPC = tempPc ^ (ULL(1) << PcTBitShift);"
<
107c95
< newPC = '(PC & PcModeMask) | Op1'
---
> newPC = 'Op1'
129a118,127
>
> if imm and link: #blx with imm
> branchStr = '''
> Addr tempPc = ((%(newPC)s) & mask(32)) | (PC & ~mask(32));
> FNPC = tempPc ^ (ULL(1) << PcTBitShift);
> '''
> else:
> branchStr = "IWNPC = %(newPC)s;"
> branchStr = branchStr % { "newPC" : newPC }
>