[gem5-dev] Change in gem5/gem5[develop]: arch-power: Fix power build.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/44585 )

Change subject: arch-power: Fix power build.
......................................................................

arch-power: Fix power build.

Change-Id: I38b1d9e4360a8eb1cfc80bee369b5aa503dd6db2
---
M src/arch/power/insts/integer.hh
M src/arch/power/isa/decoder.isa
M src/arch/power/isa/formats/fp.isa
M src/arch/power/isa/formats/integer.isa
4 files changed, 4 insertions(+), 3 deletions(-)



diff --git a/src/arch/power/insts/integer.hh  
b/src/arch/power/insts/integer.hh
index 1771fea..0ede724 100644
--- a/src/arch/power/insts/integer.hh
+++ b/src/arch/power/insts/integer.hh
@@ -30,6 +30,7 @@
 #define __ARCH_POWER_INSTS_INTEGER_HH__

 #include "arch/power/insts/static_inst.hh"
+#include "arch/power/regs/misc.hh"
 #include "base/bitfield.hh"
 #include "base/cprintf.hh"

diff --git a/src/arch/power/isa/decoder.isa b/src/arch/power/isa/decoder.isa
index 7f22d8c..71f8b3e 100644
--- a/src/arch/power/isa/decoder.isa
+++ b/src/arch/power/isa/decoder.isa
@@ -325,7 +325,7 @@
                     }
                 }
                 Xer xer = XER;
-                Cr cr = CR;
+                PowerISA::Cr cr = CR;
                 cr.cr0 = ((store_performed ? 0x2 : 0x0) | xer.so);
                 CR = cr;
                 Rsv = 0;
diff --git a/src/arch/power/isa/formats/fp.isa  
b/src/arch/power/isa/formats/fp.isa
index 4d544ad..b607400 100644
--- a/src/arch/power/isa/formats/fp.isa
+++ b/src/arch/power/isa/formats/fp.isa
@@ -37,7 +37,7 @@
     readFPSCRCode = 'Fpscr fpscr = FPSCR;'

     computeCR1Code = '''
-        Cr cr = CR;
+        PowerISA::Cr cr = CR;
         cr.cr1 = (fpscr.fx << 3) | (fpscr.fex << 2) |
                  (fpscr.vx << 1) | fpscr.ox;
         CR = cr;
diff --git a/src/arch/power/isa/formats/integer.isa  
b/src/arch/power/isa/formats/integer.isa
index 0ed0bf02..f3ab30c 100644
--- a/src/arch/power/isa/formats/integer.isa
+++ b/src/arch/power/isa/formats/integer.isa
@@ -76,7 +76,7 @@
 setXERCode = 'XER = xer;'

 computeCR0Code = '''
-    Cr cr = CR;
+    PowerISA::Cr cr = CR;
     cr.cr0 = makeCRFieldSigned(%(result)s, 0, xer.so);
     CR = cr;
 '''

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44585
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: I38b1d9e4360a8eb1cfc80bee369b5aa503dd6db2
Gerrit-Change-Number: 44585
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s