Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51673 )
Change subject: arch-sparc: Fix the build for SPARC.
......................................................................
arch-sparc: Fix the build for SPARC.
The fp_enable_check mechanism was removed recently, but the removal was
only partial for SPARC which broke its build. This change completes the
removal by finishing the necessary code substitutions.
Change-Id: I3a6a6cd679b08556e5e4a2a2c4e98168ee7fe1fd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51673
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Boris Shingarov <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/sparc/isa/decoder.isa
1 file changed, 22 insertions(+), 5 deletions(-)
Approvals:
Boris Shingarov: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 7296c1a..60362da 100644
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@ -344,7 +344,7 @@
0x11: Priv::rdpic({{Rd = Pic;}}, {{Pcr<0:>}});
// 0x12 should cause an illegal instruction exception
0x13: NoPriv::rdgsr({{
- fault = checkFpEnableFault(xc);
+ fault = checkFpEnabled(Pstate, Fprs);
if (fault)
return fault;
Rd = Gsr;
@@ -1260,11 +1260,11 @@
format Trap {
0x20: Loadf::ldf({{Frds_uw = Mem_uw;}});
0x21: decode RD {
- 0x0: Load::ldfsr({{fault = checkFpEnableFault(xc);
+ 0x0: Load::ldfsr({{fault = checkFpEnabled(Pstate, Fprs);
if (fault)
return fault;
Fsr = Mem_uw | Fsr<63:32>;}});
- 0x1: Load::ldxfsr({{fault = checkFpEnableFault(xc);
+ 0x1: Load::ldxfsr({{fault = checkFpEnabled(Pstate, Fprs);
if (fault)
return fault;
Fsr = Mem_udw;}});
@@ -1274,11 +1274,11 @@
0x23: Loadf::lddf({{Frd_udw = Mem_udw;}});
0x24: Storef::stf({{Mem_uw = Frds_uw;}});
0x25: decode RD {
- 0x0: StoreFsr::stfsr({{fault = checkFpEnableFault(xc);
+ 0x0: StoreFsr::stfsr({{fault = checkFpEnabled(Pstate,
Fprs);
if (fault)
return fault;
Mem_uw = Fsr<31:0>;}});
- 0x1: StoreFsr::stxfsr({{fault = checkFpEnableFault(xc);
+ 0x1: StoreFsr::stxfsr({{fault = checkFpEnabled(Pstate,
Fprs);
if (fault)
return fault;
Mem_udw = Fsr;}});
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51673
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: I3a6a6cd679b08556e5e4a2a2c4e98168ee7fe1fd
Gerrit-Change-Number: 51673
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Boris Shingarov <[email protected]>
Gerrit-Reviewer: Gabe Black <[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
