diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-08-15 05:08:30 -0400 |
| commit | cd6eb5396569bd2a3b16148f0d5277f7f4ee1391 (patch) | |
| tree | f587628bf43f6374ca351c295116b8b70fc90aee /src/base | |
| parent | 74546aac0124a5ba09a0e6bfef18dc3e0b7509b8 (diff) | |
| parent | c9900f159e8d2fd7e32070e2cd0971caf917431d (diff) | |
| download | gem5-cd6eb5396569bd2a3b16148f0d5277f7f4ee1391.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
src/cpu/static_inst.hh:
SCCS merged
--HG--
extra : convert_revision : a4f6377dbd691ab58fe5f7958b983b092575f250
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/chunk_generator.hh | 2 | ||||
| -rw-r--r-- | src/base/loader/symtab.hh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/base/chunk_generator.hh b/src/base/chunk_generator.hh index e9d5355ca..e8238464b 100644 --- a/src/base/chunk_generator.hh +++ b/src/base/chunk_generator.hh @@ -72,7 +72,7 @@ class ChunkGenerator public: /** * Constructor. - * @param startAddr The starting address of the region. + * @param _startAddr The starting address of the region. * @param totalSize The total size of the region. * @param _chunkSize The size/alignment of chunks into which * the region should be decomposed. diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh index 55ff0c86f..184c0a996 100644 --- a/src/base/loader/symtab.hh +++ b/src/base/loader/symtab.hh @@ -104,11 +104,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, @@ -126,7 +126,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 { |