Loader: Use address mask provided to load*Symbols when loading the symbols from the...

[gem5.git] / src / base / loader / symtab.hh

diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 931fd2cc2040b3e293ec5b0b00bb8572af6d9efd..2a2fd068ed610211776bd1aea99585c9c4584a96 100644 (file)
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -24,6 +24,9 @@
  * 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.
+ *
+ * Authors: Nathan Binkert
+ *          Steve Reinhardt
  */
 
 #ifndef __SYMTAB_HH__
@@ -31,8 +34,9 @@
 
 #include <iosfwd>
 #include <map>
+#include <string>
 
-#include "sim/host.hh" // for Addr
+#include "base/types.hh"
 
 class Checkpoint;
 class SymbolTable
@@ -101,11 +105,11 @@ class SymbolTable
 
     /// Find the nearest symbol equal to or less than the supplied
     /// address (e.g., the label for the enclosing function).
-    /// @param address The address to look up.
-    /// @param symbol  Return reference for symbol string.
-    /// @param sym_address Return reference for symbol address.
-    /// @param next_sym_address Address of following symbol (for
-    /// determining valid range of symbol).
+    /// @param addr     The address to look up.
+    /// @param symbol   Return reference for symbol string.
+    /// @param symaddr  Return reference for symbol address.
+    /// @param nextaddr Address of following symbol (for
+    ///                 determining valid range of symbol).
     /// @retval True if a symbol was found.
     bool
     findNearestSymbol(Addr addr, std::string &symbol, Addr &symaddr,
@@ -123,7 +127,7 @@ class SymbolTable
     }
 
     /// Overload for findNearestSymbol() for callers who don't care
-    /// about next_sym_address.
+    /// about nextaddr.
     bool
     findNearestSymbol(Addr addr, std::string &symbol, Addr &symaddr) const
     {