diff options
author | Gabe Black <gabeblack@google.com> | 2017-11-05 17:58:56 -0800 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2017-11-22 00:18:28 +0000 |
commit | 7723adff2671cda828f1b482765b2a5d7d2039ed (patch) | |
tree | a55ac606201fd2a0fa2f923a74bc1829a7b84745 /src/arch/sparc/isa/decoder.isa | |
parent | 4bb053c3d2a4f7563eca8761f859458f8cc47a05 (diff) | |
download | gem5-7723adff2671cda828f1b482765b2a5d7d2039ed.tar.xz |
sparc: Pull flat static instruction classes out of the ISA.
These classes are just used as base classes for other instructions
and don't need to be part of the ISA definition. Pull them into
standard C++ files.
Change-Id: If3e0bd82b1e676f20459bc0293fbda49de66b554
Reviewed-on: https://gem5-review.googlesource.com/5422
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/sparc/isa/decoder.isa')
-rw-r--r-- | src/arch/sparc/isa/decoder.isa | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index 492e1a00a..799fff253 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -367,7 +367,7 @@ decode OP default Unknown::unknown() } 0x29: decode RS1 { 0x00: HPriv::rdhprhpstate({{Rd = Hpstate;}}); - 0x01: HPriv::rdhprhtstate({{Rd = Htstate;}}, checkTl=true); + 0x01: HPriv::rdhprhtstate({{Rd = Htstate;}}, check_tl=true); // 0x02 should cause an illegal instruction exception 0x03: HPriv::rdhprhintp({{Rd = Hintp;}}); // 0x04 should cause an illegal instruction exception @@ -377,10 +377,10 @@ decode OP default Unknown::unknown() 0x1F: HPriv::rdhprhstick_cmpr({{Rd = HstickCmpr;}}); } 0x2A: decode RS1 { - 0x00: Priv::rdprtpc({{Rd = Tpc;}}, checkTl=true); - 0x01: Priv::rdprtnpc({{Rd = Tnpc;}}, checkTl=true); - 0x02: Priv::rdprtstate({{Rd = Tstate;}}, checkTl=true); - 0x03: Priv::rdprtt({{Rd = Tt;}}, checkTl=true); + 0x00: Priv::rdprtpc({{Rd = Tpc;}}, check_tl=true); + 0x01: Priv::rdprtnpc({{Rd = Tnpc;}}, check_tl=true); + 0x02: Priv::rdprtstate({{Rd = Tstate;}}, check_tl=true); + 0x03: Priv::rdprtt({{Rd = Tt;}}, check_tl=true); 0x04: Priv::rdprtick({{Rd = Tick;}}); 0x05: Priv::rdprtba({{Rd = Tba;}}); 0x06: Priv::rdprpstate({{Rd = Pstate;}}); @@ -469,7 +469,7 @@ decode OP default Unknown::unknown() 0x00: NoPriv::wry({{Y = (Rs1 ^ Rs2_or_imm13)<31:0>;}}); // 0x01 should cause an illegal instruction exception 0x02: NoPriv::wrccr({{Ccr = Rs1 ^ Rs2_or_imm13;}}); - 0x03: NoPriv::wrasi({{Asi = Rs1 ^ Rs2_or_imm13;}}, false, + 0x03: NoPriv::wrasi({{Asi = Rs1 ^ Rs2_or_imm13;}}, IsSquashAfter); // 0x04-0x05 should cause an illegal instruction exception 0x06: NoPriv::wrfprs({{Fprs = Rs1 ^ Rs2_or_imm13;}}); @@ -525,13 +525,13 @@ decode OP default Unknown::unknown() } 0x32: decode RD { 0x00: Priv::wrprtpc( - {{Tpc = Rs1 ^ Rs2_or_imm13;}}, checkTl=true); + {{Tpc = Rs1 ^ Rs2_or_imm13;}}, check_tl=true); 0x01: Priv::wrprtnpc( - {{Tnpc = Rs1 ^ Rs2_or_imm13;}}, checkTl=true); + {{Tnpc = Rs1 ^ Rs2_or_imm13;}}, check_tl=true); 0x02: Priv::wrprtstate( - {{Tstate = Rs1 ^ Rs2_or_imm13;}}, checkTl=true); + {{Tstate = Rs1 ^ Rs2_or_imm13;}}, check_tl=true); 0x03: Priv::wrprtt( - {{Tt = Rs1 ^ Rs2_or_imm13;}}, checkTl=true); + {{Tt = Rs1 ^ Rs2_or_imm13;}}, check_tl=true); 0x04: HPriv::wrprtick({{Tick = Rs1 ^ Rs2_or_imm13;}}); 0x05: Priv::wrprtba({{Tba = Rs1 ^ Rs2_or_imm13;}}); 0x06: Priv::wrprpstate({{Pstate = Rs1 ^ Rs2_or_imm13;}}); @@ -560,7 +560,7 @@ decode OP default Unknown::unknown() 0x33: decode RD { 0x00: HPriv::wrhprhpstate({{Hpstate = Rs1 ^ Rs2_or_imm13;}}); 0x01: HPriv::wrhprhtstate( - {{Htstate = Rs1 ^ Rs2_or_imm13;}}, checkTl=true); + {{Htstate = Rs1 ^ Rs2_or_imm13;}}, check_tl=true); // 0x02 should cause an illegal instruction exception 0x03: HPriv::wrhprhintp({{Hintp = Rs1 ^ Rs2_or_imm13;}}); // 0x04 should cause an illegal instruction exception @@ -1082,7 +1082,7 @@ decode OP default Unknown::unknown() NPC = Tnpc; NNPC = Tnpc + 4; Tl = Tl - 1; - }}, checkTl=true); + }}, check_tl=true); 0x1: Priv::retry({{ Cwp = Tstate<4:0>; Pstate = Tstate<20:8>; @@ -1093,7 +1093,7 @@ decode OP default Unknown::unknown() NPC = Tpc; NNPC = Tnpc; Tl = Tl - 1; - }}, checkTl=true); + }}, check_tl=true); } } } |