From 016d472c462d358935533d957d447f48433e6f1a Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Tue, 12 May 2009 22:33:05 -0700
Subject: [PATCH] ruby: remove random uint typedef and use unsigned

---
 src/mem/gems_common/util.cc          |  2 +-
 src/mem/ruby/common/Global.hh        |  1 -
 src/mem/ruby/common/SubBlock.hh      |  2 +-
 src/mem/slicc/symbols/SymbolTable.cc | 10 +++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mem/gems_common/util.cc b/src/mem/gems_common/util.cc
index f1535bdcf..d7b0e7853 100644
--- a/src/mem/gems_common/util.cc
+++ b/src/mem/gems_common/util.cc
@@ -42,7 +42,7 @@ string string_split(string& str, char split_character)
   string head = "";
   string tail = "";
 
-  uint counter = 0;
+  unsigned counter = 0;
   while(counter < str.size()) {
     if (str[counter] == split_character) {
       counter++;
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index 6b524bb70..de2d06e0e 100644
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -85,7 +85,6 @@ typedef integer_t simtime_t;
 typedef Time LogicalTime;
 typedef int64 Index;            // what the address bit ripper returns
 typedef int word;               // one word of a cache line
-typedef unsigned int uint;
 typedef int SwitchID;
 typedef int LinkID;
 
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 5831be35a..2943bb886 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -85,7 +85,7 @@ private:
   // Data Members (m_ prefix)
   Address m_address;
   Address m_logicalAddress;
-  Vector<uint> m_data;
+  Vector<unsigned> m_data;
 };
 
 // Output operator declaration
diff --git a/src/mem/slicc/symbols/SymbolTable.cc b/src/mem/slicc/symbols/SymbolTable.cc
index 70391f838..e598ffcb4 100644
--- a/src/mem/slicc/symbols/SymbolTable.cc
+++ b/src/mem/slicc/symbols/SymbolTable.cc
@@ -477,8 +477,8 @@ void SymbolTable::writeChipFiles(string path) const
                 string child_types = var->lookupPair("child_types");
                 string::iterator it = child_types.begin();
 
-                uint num_types = 0;
-                for(uint t=0;t<child_types.size();t++){
+                unsigned num_types = 0;
+                for(unsigned t=0;t<child_types.size();t++){
                   if(child_types.at(t) == '<'){
                     num_types++;
                   }
@@ -488,10 +488,10 @@ void SymbolTable::writeChipFiles(string path) const
                 string* ids = new string[num_types];
                 int type_idx = 0;
                 bool id_done = false;
-                for(uint t=0;t<child_types.size();t++){
+                for(unsigned t=0;t<child_types.size();t++){
                   if(child_types[t] == '<'){
                     id_done = false;
-                    uint r;
+                    unsigned r;
                     for(r=t+1;child_types.at(r)!='>';r++){
                       if(r == child_types.size()){
                         cerr << "Parse error in child_types" << endl;
@@ -509,7 +509,7 @@ void SymbolTable::writeChipFiles(string path) const
                   }
                 }
 
-                for(uint t=0;t<num_types;t++){
+                for(unsigned t=0;t<num_types;t++){
                   if(t==0)
                     sstr << "    if(strcmp(" << child_selector << ", \"" << ids[t] << "\") == 0)" << endl;
                   else
-- 
2.30.2