Minor cleanup of symtab code/includes.

base/loader/symtab.cc:
base/loader/symtab.hh:
    Get rid of old unused calls.
cpu/simple_cpu/simple_cpu.hh:
    No need to include base/loader/symtab.hh
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
    Include base/loader/symtab.hh (since it's no longer included in system.hh)
sim/system.hh:
    Replace include of base/loader/symtab.hh with forward class decl.

--HG--
extra : convert_revision : 3a778c2f409ec94e3b00eaa9b3859943cb39918c

diff --git a/base/loader/symtab.cc b/base/loader/symtab.cc
index c018ae4f864623f1c68dc8f0078e9360704680ad..2a29a85752aba200c2f1992260936f34e04321f5 100644 (file)
--- a/base/loader/symtab.cc
+++ b/base/loader/symtab.cc
@@ -136,19 +136,3 @@ SymbolTable::findAddress(const string &symbol, Addr &address) const
     address = (*i).second;
     return true;
 }
-
-string
-SymbolTable::find(Addr addr) const
-{
-    string s;
-    findSymbol(addr, s);
-    return s;
-}
-
-Addr
-SymbolTable::find(const string &symbol) const
-{
-    Addr a = 0;
-    findAddress(symbol, a);
-    return a;
-}

diff --git a/base/loader/symtab.hh b/base/loader/symtab.hh
index df3783991af757decaf7a73050c963dd587616c4..5ae29b057801aee6a8c291f9aa14a1ea20f6e0b5 100644 (file)
--- a/base/loader/symtab.hh
+++ b/base/loader/symtab.hh
@@ -72,9 +72,6 @@ class SymbolTable
 
     bool findSymbol(Addr address, std::string &symbol) const;
     bool findAddress(const std::string &symbol, Addr &address) const;
-
-    std::string find(Addr addr) const;
-    Addr find(const std::string &symbol) const;
 };
 
 /// Global unified debugging symbol table (for target).  Conceptually

diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index 1610d606068e0d96e9a2297608aaff7d59663c6c..8ea100b223e1d0310d496872e3f796c68d1381ed 100644 (file)
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -31,7 +31,6 @@
 
 #include "cpu/base_cpu.hh"
 #include "sim/eventq.hh"
-#include "base/loader/symtab.hh"
 #include "cpu/pc_event.hh"
 #include "base/statistics.hh"
 #include "cpu/exec_context.hh"

diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index a8ab12f98e22f3b1e201203692c6fc696efd4461..4342463c372f887cefb917588cf78201fe41aff9 100644 (file)
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -35,6 +35,7 @@
  * up boot time.
  */
 
+#include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "cpu/base_cpu.hh"

diff --git a/kern/tru64/tru64_system.cc b/kern/tru64/tru64_system.cc
index 0380c9478acc9a7982cb43098d212fef9b980054..c6435cb1870642564a95ea84208e410db5658e86 100644 (file)
--- a/kern/tru64/tru64_system.cc
+++ b/kern/tru64/tru64_system.cc
@@ -26,6 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "cpu/exec_context.hh"
 #include "kern/tru64/tru64_events.hh"

diff --git a/sim/system.hh b/sim/system.hh
index 61784b0442bdfad96929ea4dbeb11356b8bde883..07881ff01c5050ca5d027338e9234c36601ff51c 100644 (file)
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -32,7 +32,6 @@
 #include <string>
 #include <vector>
 
-#include "base/loader/symtab.hh"
 #include "base/statistics.hh"
 #include "cpu/pc_event.hh"
 #include "kern/system_events.hh"
@@ -43,6 +42,7 @@ class PhysicalMemory;
 class Platform;
 class RemoteGDB;
 class GDBListener;
+class SymbolTable;
 class ObjectFile;
 class ExecContext;
 namespace Kernel { class Binning; }