From d64465c02482fc2afa4c1467650976856c9a440a Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 30 Aug 2020 01:32:43 -0700 Subject: [PATCH] mips,cpu: Get rid of the IsERET StaticInst flag. This is set by MIPS but doesn't have an accessor in StaticInst, and isn't used by anything. Change-Id: Ie28d2df134dcf264bca17c9c66dd32515a240492 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33738 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- src/arch/mips/isa/decoder.isa | 4 ++-- src/cpu/StaticInstFlags.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/arch/mips/isa/decoder.isa b/src/arch/mips/isa/decoder.isa index f62000ebe..76453b09f 100644 --- a/src/arch/mips/isa/decoder.isa +++ b/src/arch/mips/isa/decoder.isa @@ -719,7 +719,7 @@ decode OPCODE_HI default Unknown::unknown() { LLFlag = 0; Status = status; SRSCtl = srsCtl; - }}, IsReturn, IsSerializing, IsERET); + }}, IsReturn, IsSerializing); 0x1F: deret({{ DebugReg debug = Debug; @@ -732,7 +732,7 @@ decode OPCODE_HI default Unknown::unknown() { // Undefined; } Debug = debug; - }}, IsReturn, IsSerializing, IsERET); + }}, IsReturn, IsSerializing); } format CP0TLB { 0x01: tlbr({{ diff --git a/src/cpu/StaticInstFlags.py b/src/cpu/StaticInstFlags.py index acaa7bfca..b70f919b0 100644 --- a/src/cpu/StaticInstFlags.py +++ b/src/cpu/StaticInstFlags.py @@ -85,7 +85,6 @@ class StaticInstFlags(Enum): 'IsMemBarrier', # Is a memory barrier 'IsWriteBarrier', # Is a write barrier 'IsReadBarrier', # Is a read barrier - 'IsERET', # <- Causes the IFU to stall (MIPS ISA) 'IsNonSpeculative', # Should not be executed speculatively 'IsQuiesce', # Is a quiesce instruction -- 2.30.2