From 10f82934be924f265af4f10b15ca66106171f770 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 1 Oct 2014 08:05:51 -0400
Subject: arm: More UBSan cleanups after additional full-system runs

Some incorrect casting to IntRegIndex, and a few uninitialized members
in the i8254xGBe device.
---
 src/arch/arm/isa/formats/misc.isa   | 4 ++--
 src/arch/arm/isa/templates/misc.isa | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/arch/arm/isa')

diff --git a/src/arch/arm/isa/formats/misc.isa b/src/arch/arm/isa/formats/misc.isa
index 7d3865104..925ed55cd 100644
--- a/src/arch/arm/isa/formats/misc.isa
+++ b/src/arch/arm/isa/formats/misc.isa
@@ -274,8 +274,8 @@ let {{
                 uint32_t iss = mcrrMrrcIssBuild(isRead, crm, rt, rt2, opc1);
 
                 if (isRead)
-                    return new Mrrc15(machInst, (IntRegIndex) miscReg, rt2, rt, iss);
-                return new Mcrr15(machInst, rt2, rt, (IntRegIndex) miscReg, iss);
+                    return new Mrrc15(machInst, miscReg, rt2, rt, iss);
+                return new Mcrr15(machInst, rt2, rt, miscReg, iss);
             } else {
                 return new FailUnimplemented(isRead ? "mrrc" : "mcrr", machInst,
                     csprintf("%s %s",
diff --git a/src/arch/arm/isa/templates/misc.isa b/src/arch/arm/isa/templates/misc.isa
index 5cd4637a6..d661b4f18 100644
--- a/src/arch/arm/isa/templates/misc.isa
+++ b/src/arch/arm/isa/templates/misc.isa
@@ -183,7 +183,7 @@ class %(class_name)s : public %(base_class)s
   protected:
     public:
         // Constructor
-        %(class_name)s(ExtMachInst machInst, IntRegIndex _op1,
+        %(class_name)s(ExtMachInst machInst, MiscRegIndex _op1,
                        IntRegIndex _dest, IntRegIndex _dest2, uint32_t imm);
         %(BasicExecDeclare)s
 };
@@ -191,7 +191,7 @@ class %(class_name)s : public %(base_class)s
 
 def template MrrcOpConstructor {{
     %(class_name)s::%(class_name)s(ExtMachInst machInst,
-                                          IntRegIndex op1,
+                                          MiscRegIndex op1,
                                           IntRegIndex dest,
                                           IntRegIndex dest2,
                                           uint32_t    imm)
@@ -214,7 +214,7 @@ class %(class_name)s : public %(base_class)s
     public:
         // Constructor
         %(class_name)s(ExtMachInst machInst, IntRegIndex _op1, IntRegIndex _op2,
-                       IntRegIndex _dest, uint32_t imm);
+                       MiscRegIndex _dest, uint32_t imm);
         %(BasicExecDeclare)s
 };
 }};
@@ -223,7 +223,7 @@ def template McrrOpConstructor {{
     %(class_name)s::%(class_name)s(ExtMachInst machInst,
                                           IntRegIndex op1,
                                           IntRegIndex op2,
-                                          IntRegIndex dest,
+                                          MiscRegIndex dest,
                                           uint32_t    imm)
         : %(base_class)s("%(mnemonic)s", machInst, %(op_class)s, op1, op2,
                          dest, imm)
-- 
cgit v1.2.3