revert 5af8f40d8f2c

4 files changed, 19 insertions, 46 deletions

diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 03cf785ef..ab08e6b4a 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -157,8 +157,6 @@ printRegName(std::ostream &os, TheISA::RegIndex reg)
         break;
       case CCRegClass:
         os << 'c' << static_cast<unsigned int>(reg - TheISA::CC_Reg_Base);
-      case VectorRegClass:
-        os << 'v' << static_cast<unsigned int>(reg - TheISA::Vector_Reg_Base);
     }
 }
 
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 6ea74047c..80d5d9872 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -140,20 +140,6 @@ class ExecContext : public ::ExecContext
         return thread.readFloatRegBits(reg_idx);
     }
 
-    TheISA::CCReg
-    readCCRegOperand(const StaticInst *si, int idx)
-    {
-        int reg_idx = si->srcRegIdx(idx) - TheISA::CC_Reg_Base;
-        return thread.readCCReg(reg_idx);
-    }
-
-    const TheISA::VectorReg &
-    readVectorRegOperand(const StaticInst *si, int idx)
-    {
-        int reg_idx = si->srcRegIdx(idx) - TheISA::Vector_Reg_Base;
-        return thread.readVectorReg(reg_idx);
-    }
-
     void
     setIntRegOperand(const StaticInst *si, int idx, IntReg val)
     {
@@ -176,21 +162,6 @@ class ExecContext : public ::ExecContext
         thread.setFloatRegBits(reg_idx, val);
     }
 
-    void
-    setCCRegOperand(const StaticInst *si, int idx, TheISA::CCReg val)
-    {
-        int reg_idx = si->destRegIdx(idx) - TheISA::CC_Reg_Base;
-        thread.setCCReg(reg_idx, val);
-    }
-
-    void
-    setVectorRegOperand(const StaticInst *si, int idx,
-                        const TheISA::VectorReg &val)
-    {
-        int reg_idx = si->destRegIdx(idx) - TheISA::Vector_Reg_Base;
-        thread.setVectorReg(reg_idx, val);
-    }
-
     bool
     readPredicate()
     {
@@ -294,6 +265,20 @@ class ExecContext : public ::ExecContext
         thread.getDTBPtr()->demapPage(vaddr, asn);
     }
 
+    TheISA::CCReg
+    readCCRegOperand(const StaticInst *si, int idx)
+    {
+        int reg_idx = si->srcRegIdx(idx) - TheISA::CC_Reg_Base;
+        return thread.readCCReg(reg_idx);
+    }
+
+    void
+    setCCRegOperand(const StaticInst *si, int idx, TheISA::CCReg val)
+    {
+        int reg_idx = si->destRegIdx(idx) - TheISA::CC_Reg_Base;
+        thread.setCCReg(reg_idx, val);
+    }
+
     void
     demapInstPage(Addr vaddr, uint64_t asn)
     {
diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index 3eb09271a..f6b1f7944 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -71,11 +71,6 @@ Scoreboard::findIndex(RegIndex reg, Index &scoreboard_index)
             scoreboard_index = TheISA::NumIntRegs + reg - TheISA::FP_Reg_Base;
             ret = true;
             break;
-          case VectorRegClass:
-            scoreboard_index = TheISA::NumIntRegs + TheISA::NumCCRegs +
-                    TheISA::NumFloatRegs + reg - TheISA::Vector_Reg_Base;
-            ret = true;
-            break;
           case MiscRegClass:
               /* Don't bother with Misc registers */
             ret = false;
@@ -104,9 +99,6 @@ flattenRegIndex(TheISA::RegIndex reg, ThreadContext *thread_context)
       case CCRegClass:
         ret = thread_context->flattenCCIndex(reg);
         break;
-      case VectorRegClass:
-        ret = thread_context->flattenVectorIndex(reg);
-        break;
       case MiscRegClass:
         /* Don't bother to flatten misc regs as we don't need them here */
         /* return thread_context->flattenMiscIndex(reg); */
diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh
index 3a3a9d3c3..711bcafb2 100644
--- a/src/cpu/minor/scoreboard.hh
+++ b/src/cpu/minor/scoreboard.hh
@@ -60,13 +60,11 @@ class Scoreboard : public Named
 {
   public:
     /** The number of registers in the Scoreboard.  These
-     *  are just the integer, CC, float and vector registers packed
+     *  are just the integer, CC and float registers packed
      *  together with integer regs in the range [0,NumIntRegs-1],
-     *  CC regs in the range [NumIntRegs, NumIntRegs + NumCCRegs - 1],
-     *  float regs in the range
-     *  [NumIntRegs + NumCCRegs, NumFloatRegs + NumIntRegs + NumCCRegs - 1]
-     *  and vector regs in the range [NumFloatRegs + NumIntRegs + NumCCRegs,
-     *  NumFloatRegs + NumIntRegs + NumCCRegs + NumVectorRegs - 1]*/
+     *  CC regs in the range [NumIntRegs, NumIntRegs+NumCCRegs-1]
+     *  and float regs in the range
+     *  [NumIntRegs+NumCCRegs, NumFloatRegs+NumIntRegs+NumCCRegs-1] */
     const unsigned numRegs;
 
     /** Type to use for thread context registers */
@@ -99,7 +97,7 @@ class Scoreboard : public Named
     Scoreboard(const std::string &name) :
         Named(name),
         numRegs(TheISA::NumIntRegs + TheISA::NumCCRegs +
-            TheISA::NumFloatRegs + TheISA::NumVectorRegs),
+            TheISA::NumFloatRegs),
         numResults(numRegs, 0),
         numUnpredictableResults(numRegs, 0),
         fuIndices(numRegs, 0),