Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52076 )
(
20 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch: Make the decoder takeOverFrom method virtual.
......................................................................
arch: Make the decoder takeOverFrom method virtual.
This is only implemented for x86. It's called very rarely, and so
virtual function overhead is practically irrelevant.
Change-Id: Ib6e05a903df95b801164e44d1662e130419fdbd8
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52076
Tested-by: kokoro <[email protected]>
Reviewed-by: Daniel Carvalho <[email protected]>
Reviewed-by: Earl Ou <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/arch/generic/decoder.hh
M src/arch/riscv/decoder.hh
M src/arch/sparc/decoder.hh
M src/arch/mips/decoder.hh
M src/arch/power/decoder.hh
M src/arch/x86/decoder.hh
M src/arch/arm/decoder.hh
7 files changed, 42 insertions(+), 24 deletions(-)
Approvals:
Earl Ou: Looks good to me, approved
Daniel Carvalho: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/decoder.hh b/src/arch/arm/decoder.hh
index d2e0c68..ba2cb70 100644
--- a/src/arch/arm/decoder.hh
+++ b/src/arch/arm/decoder.hh
@@ -176,14 +176,6 @@
*/
StaticInstPtr decode(PCStateBase &pc);
- /**
- * Take over the state from an old decoder when switching CPUs.
- *
- * @param old Decoder used in old CPU
- */
- void takeOverFrom(Decoder *old) {}
-
-
public: // ARM-specific decoder state manipulation
void
setContext(FPSCR fpscr)
diff --git a/src/arch/generic/decoder.hh b/src/arch/generic/decoder.hh
index e9ebba8..5033554 100644
--- a/src/arch/generic/decoder.hh
+++ b/src/arch/generic/decoder.hh
@@ -62,6 +62,18 @@
outOfBytes = true;
}
+ /**
+ * Take over the state from an old decoder when switching CPUs.
+ *
+ * @param old Decoder used in old CPU
+ */
+ virtual void
+ takeOverFrom(InstDecoder *old)
+ {
+ instDone = old->instDone;
+ outOfBytes = old->outOfBytes;
+ }
+
void *moreBytesPtr() const { return _moreBytesPtr; }
size_t moreBytesSize() const { return _moreBytesSize; }
Addr pcMask() const { return _pcMask; }
diff --git a/src/arch/mips/decoder.hh b/src/arch/mips/decoder.hh
index d738767..72b9c69 100644
--- a/src/arch/mips/decoder.hh
+++ b/src/arch/mips/decoder.hh
@@ -64,8 +64,6 @@
instDone = true;
}
- void takeOverFrom(Decoder *old) {}
-
protected:
/// A cache of decoded instruction objects.
static GenericISA::BasicDecodeCache<Decoder, ExtMachInst> defaultCache;
diff --git a/src/arch/power/decoder.hh b/src/arch/power/decoder.hh
index dcd1e53..f275ecf 100644
--- a/src/arch/power/decoder.hh
+++ b/src/arch/power/decoder.hh
@@ -61,8 +61,6 @@
instDone = true;
}
- void takeOverFrom(Decoder *old) {}
-
protected:
/// A cache of decoded instruction objects.
static GenericISA::BasicDecodeCache<Decoder, ExtMachInst> defaultCache;
diff --git a/src/arch/riscv/decoder.hh b/src/arch/riscv/decoder.hh
index 718e698..a1a893a 100644
--- a/src/arch/riscv/decoder.hh
+++ b/src/arch/riscv/decoder.hh
@@ -75,8 +75,6 @@
//when there is control flow.
void moreBytes(const PCStateBase &pc, Addr fetchPC);
- void takeOverFrom(Decoder *old) {}
-
StaticInstPtr decode(PCStateBase &nextPC);
};
diff --git a/src/arch/sparc/decoder.hh b/src/arch/sparc/decoder.hh
index 31b3014..e6bd817 100644
--- a/src/arch/sparc/decoder.hh
+++ b/src/arch/sparc/decoder.hh
@@ -80,8 +80,6 @@
asi = _asi;
}
- void takeOverFrom(Decoder *old) {}
-
protected:
/// A cache of decoded instruction objects.
static GenericISA::BasicDecodeCache<Decoder, ExtMachInst> defaultCache;
diff --git a/src/arch/x86/decoder.hh b/src/arch/x86/decoder.hh
index a965fab..ff136af 100644
--- a/src/arch/x86/decoder.hh
+++ b/src/arch/x86/decoder.hh
@@ -291,17 +291,22 @@
}
void
- takeOverFrom(Decoder *old)
+ takeOverFrom(InstDecoder *old) override
{
- mode = old->mode;
- submode = old->submode;
+ InstDecoder::takeOverFrom(old);
+
+ Decoder *dec = dynamic_cast<Decoder *>(old);
+ assert(dec);
+
+ mode = dec->mode;
+ submode = dec->submode;
emi.mode.mode = mode;
emi.mode.submode = submode;
- altOp = old->altOp;
- defOp = old->defOp;
- altAddr = old->altAddr;
- defAddr = old->defAddr;
- stack = old->stack;
+ altOp = dec->altOp;
+ defOp = dec->defOp;
+ altAddr = dec->altAddr;
+ defAddr = dec->defAddr;
+ stack = dec->stack;
}
void
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52076
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib6e05a903df95b801164e44d1662e130419fdbd8
Gerrit-Change-Number: 52076
Gerrit-PatchSet: 22
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Earl Ou <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Giacomo Travaglini <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
