diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2010-12-08 10:33:03 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2010-12-08 10:33:03 -0800 |
commit | 7f3f90f71d6993f8a712294e40fe8723bc3d7dbc (patch) | |
tree | 3ab35474e9c81957e02f3343af6be7bcccc52d70 /src/arch/power/isa/decoder.isa | |
parent | f01d2efe8a106692fd83936d3c6d3565a001616c (diff) | |
download | gem5-7f3f90f71d6993f8a712294e40fe8723bc3d7dbc.tar.xz |
POWER: Take advantage of new PCState syntax.
Diffstat (limited to 'src/arch/power/isa/decoder.isa')
-rw-r--r-- | src/arch/power/isa/decoder.isa | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/arch/power/isa/decoder.isa b/src/arch/power/isa/decoder.isa index 671f57389..336e35d48 100644 --- a/src/arch/power/isa/decoder.isa +++ b/src/arch/power/isa/decoder.isa @@ -381,20 +381,12 @@ decode OPCODE default Unknown::unknown() { // Conditionally branch relative to PC based on CR and CTR. format BranchPCRelCondCtr { - 0: bc({{ - PowerISA::PCState pc = PCS; - pc.npc((uint32_t)(pc.pc() + disp)); - PCS = pc; - }}); + 0: bc({{ NPC = (uint32_t)(PC + disp); }}); } // Conditionally branch to fixed address based on CR and CTR. format BranchNonPCRelCondCtr { - 1: bca({{ - PowerISA::PCState pc = PCS; - pc.npc(targetAddr); - PCS = pc; - }}); + 1: bca({{ NPC = targetAddr; }}); } } @@ -402,20 +394,12 @@ decode OPCODE default Unknown::unknown() { // Unconditionally branch relative to PC. format BranchPCRel { - 0: b({{ - PowerISA::PCState pc = PCS; - pc.npc((uint32_t)(pc.pc() + disp)); - PCS = pc; - }}); + 0: b({{ NPC = (uint32_t)(PC + disp); }}); } // Unconditionally branch to fixed address. format BranchNonPCRel { - 1: ba({{ - PowerISA::PCState pc = PCS; - pc.npc(targetAddr); - PCS = pc; - }}); + 1: ba({{ NPC = targetAddr; }}); } } @@ -423,20 +407,12 @@ decode OPCODE default Unknown::unknown() { // Conditionally branch to address in LR based on CR and CTR. format BranchLrCondCtr { - 16: bclr({{ - PowerISA::PCState pc = PCS; - pc.npc(LR & 0xfffffffc); - PCS = pc; - }}); + 16: bclr({{ NPC = LR & 0xfffffffc; }}); } // Conditionally branch to address in CTR based on CR. format BranchCtrCond { - 528: bcctr({{ - PowerISA::PCState pc = PCS; - pc.npc(CTR & 0xfffffffc); - PCS = pc; - }}); + 528: bcctr({{ NPC = CTR & 0xfffffffc; }}); } // Condition register manipulation instructions. |