ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base

3 files changed, 0 insertions, 200 deletions

diff --git a/src/mem/gems_common/SConscript b/src/mem/gems_common/SConscript
index 851aa412f..86d8bb345 100644
--- a/src/mem/gems_common/SConscript
+++ b/src/mem/gems_common/SConscript
@@ -33,6 +33,4 @@ Import('*')
 if not env['RUBY']:
     Return()
 
-Source('util.cc')
-
 TraceFlag('GemsCommon')
diff --git a/src/mem/gems_common/util.cc b/src/mem/gems_common/util.cc
deleted file mode 100644
index d7ce2e893..000000000
--- a/src/mem/gems_common/util.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * $Id$
- */
-
-#include <cassert>
-#include <iomanip>
-#include <sstream>
-
-#include "mem/gems_common/util.hh"
-
-using namespace std;
-
-// Split a string into a head and tail strings on the specified
-// character.  Return the head and the string passed in is modified by
-// removing the head, leaving just the tail.
-
-string string_split(string& str, char split_character)
-{
-  string head = "";
-  string tail = "";
-
-  unsigned counter = 0;
-  while(counter < str.size()) {
-    if (str[counter] == split_character) {
-      counter++;
-      break;
-    } else {
-      head += str[counter];
-    }
-    counter++;
-  }
-
-  while(counter < str.size()) {
-    tail += str[counter];
-    counter++;
-  }
-  str = tail;
-  return head;
-}
-
-string bool_to_string(bool value)
-{
-  if (value) {
-    return "true";
-  } else {
-    return "false";
-  }
-}
-
-string int_to_string(int n, bool zero_fill, int width)
-{
-  ostringstream sstr;
-  if(zero_fill) {
-    sstr << setw(width) << setfill('0') << n;
-  } else {
-    sstr << n;
-  }
-  string str = sstr.str();
-  return str;
-}
-
-float string_to_float(string& str)
-{
-  stringstream sstr(str);
-  float ret;
-  sstr >> ret;
-  return ret;
-}
-
-bool string_to_bool(const string & str)
-{
-  string lower(str);
-  for (size_t i=0;i<str.length();i++)
-    lower[i] = tolower(str[i]);
-  if (lower == "true")
-    return true;
-  else if (lower == "false")
-    return false;
-  else
-    assert(0);
-
-  return false;
-}
-
-// Log functions
-int log_int(long long n)
-{
-  assert(n > 0);
-  int counter = 0;
-  while (n >= 2) {
-    counter++;
-    n = n>>(long long)(1);
-  }
-  return counter;
-}
-
-bool is_power_of_2(long long n)
-{
-  return (n == ((long long)(1) << log_int(n)));
-}
-
diff --git a/src/mem/gems_common/util.hh b/src/mem/gems_common/util.hh
deleted file mode 100644
index f5a86f325..000000000
--- a/src/mem/gems_common/util.hh
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * $Id$
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <string>
-
-std::string string_split(std::string& str, char split_character);
-std::string bool_to_string(bool value);
-std::string int_to_string(int n, bool zero_fill = false, int width = 0);
-float string_to_float(std::string& str);
-bool string_to_bool(const std::string & str);
-int log_int(long long n);
-bool is_power_of_2(long long n);
-
-// Min and Max functions (since they are extern inline, they are as
-// fast as macros)
-
-extern inline
-int max(int n1, int n2)
-{
-  if (n1 > n2) {
-    return n1;
-  } else {
-    return n2;
-  }
-}
-
-extern inline
-int min(int n1, int n2)
-{
-  if (n1 < n2) {
-    return n1;
-  } else {
-    return n2;
-  }
-}
-
-#endif //UTIL_H