49,50c49,50
< Addr PC = readPC(xc);
< NPC = ((PC + imm) & mask(32)) | (PC & ~mask(32));
---
> Addr curPc = readPC(xc);
> NPC = ((curPc + imm) & mask(32)) | (curPc & ~mask(32));
54c54
< Addr tBit = PC & (ULL(1) << PcTBitShift);
---
> Addr tBit = curPc & (ULL(1) << PcTBitShift);
56c56
< LR = PC - 4;
---
> LR = curPc - 4;
58c58
< LR = PC | 1;
---
> LR = curPc | 1;
70,71c70,71
< Addr PC = readPC(xc);
< Addr tBit = PC & (ULL(1) << PcTBitShift);
---
> Addr curPc = readPC(xc);
> Addr tBit = curPc & (ULL(1) << PcTBitShift);
89c89
< newPC = '(!arm ? (roundDown(PC, 4) + imm) : (PC + imm))'
---
> newPC = '(!arm ? (roundDown(curPc, 4) + imm) : (curPc + imm))'
105c105
< LR = PC - 4;
---
> LR = curPc - 4;
107c107
< LR = PC | 1;
---
> LR = curPc | 1;
112c112
< LR = PC - 4;
---
> LR = curPc - 4;
114c114
< LR = (PC - 2) | 1;
---
> LR = (curPc - 2) | 1;
121c121
< Addr tempPc = ((%(newPC)s) & mask(32)) | (PC & ~mask(32));
---
> Addr tempPc = ((%(newPC)s) & mask(32)) | (curPc & ~mask(32));
143,144c143,144
< Addr PC = readPC(xc);
< NPC = ((PC + imm) & mask(32)) | (PC & ~mask(32));
---
> Addr curPc = readPC(xc);
> NPC = ((curPc + imm) & mask(32)) | (curPc & ~mask(32));