Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/55823 )
(
10 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch-x86: Make the flags microops handle reserved bits
better.
......................................................................
arch-x86: Make the flags microops handle reserved bits better.
These microops should report bits which are RAZ as zero and RAO as one,
and not let those bits get overwritten with anything else.
Change-Id: I8e867b311b485234ac457bf58fad1673892dfa6a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/55823
Reviewed-by: Matthew Poremba <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/x86/isa/microops/regop.isa
1 file changed, 26 insertions(+), 7 deletions(-)
Approvals:
Matthew Poremba: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/isa/microops/regop.isa
b/src/arch/x86/isa/microops/regop.isa
index d56e17c..556a02c 100644
--- a/src/arch/x86/isa/microops/regop.isa
+++ b/src/arch/x86/isa/microops/regop.isa
@@ -1177,18 +1177,21 @@
class Wrflags(WrRegOp):
code = '''
- RegVal newFlags = PSrcReg1 ^ op2;
- RegVal userFlagMask = 0xDD5;
+ const RegVal new_flags = PSrcReg1 ^ op2;
// Get only the user flags
- ccFlagBits = newFlags & ccFlagMask;
- dfBit = newFlags & DFBit;
- cfofBits = newFlags & cfofMask;
+ ccFlagBits = new_flags & ccFlagMask;
+ dfBit = new_flags & DFBit;
+ cfofBits = new_flags & cfofMask;
ecfBit = 0;
ezfBit = 0;
// Get everything else
- nccFlagBits = newFlags & ~userFlagMask;
+ const RegVal IOPLMask = mask(2) << 12;
+ const RegVal SysFlagMask =
+ TFBit | IFBit | IOPLMask | NTBit | RFBit | VMBit |
+ ACBit | VIFBit | VIPBit | IDBit;
+ nccFlagBits = new_flags & SysFlagMask;
'''
class Rdip(RdRegOp):
@@ -1200,7 +1203,7 @@
class Rflags(RdRegOp):
code = '''
DestReg = ccFlagBits | cfofBits | dfBit |
- ecfBit | ezfBit | nccFlagBits;
+ ecfBit | ezfBit | nccFlagBits | (1 << 1);
'''
class Ruflag(RegOp):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/55823
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: I8e867b311b485234ac457bf58fad1673892dfa6a
Gerrit-Change-Number: 55823
Gerrit-PatchSet: 13
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bradford Beckmann <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[email protected]>
Gerrit-Reviewer: kokoro <[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
