49,52c49
< ArmISA::PCState pc = PCS;
< Addr curPc = pc.instPC();
< pc.instNPC((uint32_t)(curPc + imm));
< PCS = pc;
---
> NPC = (uint32_t)(PC + imm);
56,57c53,54
< if (pc.thumb())
< LR = curPc | 1;
---
> if (Thumb)
> LR = PC | 1;
59c56
< LR = curPc - 4;
---
> LR = PC - 4;
71,72d67
< ArmISA::PCState pc = PCS;
< Addr curPc M5_VAR_USED = pc.instPC();
76d70
< PCS = pc;
88,89c82,83
< # of the current ISA. pc.thumb() is whether the target is ARM.
< newPC = '(pc.thumb() ? (roundDown(curPc, 4) + imm) : (curPc + imm))'
---
> # of the current ISA. Thumb is whether the target is ARM.
> newPC = '(Thumb ? (roundDown(PC, 4) + imm) : (PC + imm))'
104,105c98,99
< if (pc.thumb())
< LR = curPc | 1;
---
> if (Thumb)
> LR = PC | 1;
107c101
< LR = curPc - 4;
---
> LR = PC - 4;
111,112c105,106
< if (pc.thumb())
< LR = (curPc - 2) | 1;
---
> if (Thumb)
> LR = (PC - 2) | 1;
114c108
< LR = curPc - 4;
---
> LR = PC - 4;
121,122c115,116
< pc.nextThumb(!pc.thumb());
< pc.instNPC(%(newPC)s);
---
> NextThumb = !Thumb;
> NPC = %(newPC)s;
125c119
< branchStr = "pc.instIWNPC(%(newPC)s);"
---
> branchStr = "IWNPC = %(newPC)s;"
142,147c136
< code = '''
< ArmISA::PCState pc = PCS;
< Addr curPc = pc.instPC();
< pc.instNPC((uint32_t)(curPc + imm));
< PCS = pc;
< '''
---
> code = 'NPC = (uint32_t)(PC + imm);\n'
164,168c153
< accCode = '''
< ArmISA::PCState pc = PCS;
< pc.instNPC(pc.instPC() + 2 * (Mem.uh));
< PCS = pc;
< '''
---
> accCode = 'NPC = PC + 2 * (Mem.uh);\n'
177,181c162
< accCode = '''
< ArmISA::PCState pc = PCS;
< pc.instNPC(pc.instPC() + 2 * (Mem.ub));
< PCS = pc;
< '''
---
> accCode = 'NPC = PC + 2 * (Mem.ub)'