Brandon Potter has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12301 )
Change subject: sim-se: const for loader's loadSection param
..
sim-se: const for loader's loadSection param
The port proxy can be declared as a reference to a const proxy
rather than just a reference to a proxy.
Change-Id: I4640b0c5f33e2334c1e7630131f78607ced40a34
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/12301
Maintainer: Brandon Potter
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Reviewed-by: Andreas Sandberg
---
M src/base/loader/elf_object.cc
M src/base/loader/elf_object.hh
M src/base/loader/object_file.cc
M src/base/loader/object_file.hh
4 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
Brandon Potter: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index 761fd79..654cb33 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -498,7 +498,8 @@
}
bool
-ElfObject::loadSections(PortProxy& mem_proxy, Addr addr_mask, Addr offset)
+ElfObject::loadSections(const PortProxy& mem_proxy, Addr addr_mask,
+Addr offset)
{
if (!ObjectFile::loadSections(mem_proxy, addr_mask, offset))
return false;
diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index d74ee89..9585684 100644
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -94,7 +94,7 @@
public:
virtual ~ElfObject() {}
-bool loadSections(PortProxy& mem_proxy, Addr addr_mask = maxAddr,
+bool loadSections(const PortProxy& mem_proxy, Addr addr_mask = maxAddr,
Addr offset = 0) override;
virtual bool loadAllSymbols(SymbolTable *symtab, Addr base = 0,
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 86278e4..ede8922 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -73,8 +73,8 @@
bool
-ObjectFile::loadSection(Section *sec, PortProxy& mem_proxy, Addr addr_mask,
-Addr offset)
+ObjectFile::loadSection(Section *sec, const PortProxy& mem_proxy,
+Addr addr_mask, Addr offset)
{
if (sec->size != 0) {
Addr addr = (sec->baseAddr & addr_mask) + offset;
@@ -91,7 +91,8 @@
bool
-ObjectFile::loadSections(PortProxy& mem_proxy, Addr addr_mask, Addr offset)
+ObjectFile::loadSections(const PortProxy& mem_proxy, Addr addr_mask,
+ Addr offset)
{
return (loadSection(, mem_proxy, addr_mask, offset)
&& loadSection(, mem_proxy, addr_mask, offset)
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index 5da7e3c..bd9d626 100644
--- a/src/base/loader/object_file.hh
+++ b/src/base/loader/object_file.hh
@@ -88,7 +88,7 @@
static const Addr maxAddr = std::numeric_limits::max();
-virtual bool loadSections(PortProxy& mem_proxy,
+virtual bool loadSections(const PortProxy& mem_proxy,
Addr mask = maxAddr, Addr offset = 0);
virtual bool loadAllSymbols(SymbolTable *symtab, Addr base = 0,
@@ -129,7 +129,7 @@
Section data;
Section bss;
-bool loadSection(Section *sec, PortProxy& mem_proxy, Addr mask,
+bool loadSection(Section *sec, const PortProxy& mem_proxy, Addr mask,
Addr offset = 0);
void setGlobalPointer(Addr global_ptr) { globalPtr = global_ptr; }
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12301
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I4640b0c5f33e2334c1e7630131f78607ced40a34
Gerrit-Change-Number: 12301
Gerrit-PatchSet: 22
Gerrit-Owner: Brandon Potter
Gerrit-Reviewer: Alexandru Duțu
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Brandon Potter
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: John Alsop
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
