Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43249 )
Change subject: base: Remove duplicate of findNearest
......................................................................
base: Remove duplicate of findNearest
The duplicate can be solved by dumping the next address to
an internal variable when findNearest is called with a single
parameter.
Change-Id: I7bc5dd6167c01adb0e92a893899b55dc89f43365
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
---
M src/base/loader/symtab.cc
M src/base/loader/symtab.hh
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 0d0e826..ab16007 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -39,6 +39,8 @@
SymbolTable debugSymbolTable;
+Addr SymbolTable::dummyNextAddr;
+
void
SymbolTable::clear()
{
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 18b9191..559c081 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -333,7 +333,7 @@
* @retval A const_iterator which points to the symbol if found, or
end.
*/
const_iterator
- findNearest(Addr addr, Addr &next_addr) const
+ findNearest(Addr addr, Addr &next_addr=dummyNextAddr) const
{
AddrMap::const_iterator i = addrMap.end();
if (!upperBound(addr, i))
@@ -344,20 +344,13 @@
return symbols.begin() + i->second;
}
+ private:
/**
- * Overload for findNearestSymbol() for callers who don't care
- * about nextaddr.
+ * Address to be used when callers of findNearest do not care about the
+ * next address. Its contents should not be used anywhere else.
+ * @see findNearest(Addr, Addr&)
*/
- const_iterator
- findNearest(Addr addr) const
- {
- AddrMap::const_iterator i = addrMap.end();
- if (!upperBound(addr, i))
- return end();
-
- --i;
- return symbols.begin() + i->second;
- }
+ static Addr dummyNextAddr;
};
/**
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43249
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7bc5dd6167c01adb0e92a893899b55dc89f43365
Gerrit-Change-Number: 43249
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
