[gem5-dev] Change in gem5/gem5[develop]: sim-se: add missing path redirection to mmap createObjectFile

2020-04-17 Thread Ciro Santilli (Gerrit)
Ciro Santilli has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/27887 )


Change subject: sim-se: add missing path redirection to mmap  
createObjectFile

..

sim-se: add missing path redirection to mmap createObjectFile

The redirection call was mistakenly removed at:
Ide158e69cdff19bc81157e3e9826bcabc2a51140 and that breaks running
cross compiled dynamically linked executables in SE.

JIRA: https://gem5.atlassian.net/browse/GEM5-430

Change-Id: I33419c78fbf183cda0bba98f7035a2b25ebc6fa3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27887
Reviewed-by: Matthew Poremba 
Tested-by: Gem5 Cloud Project GCB service account  
<345032938...@cloudbuild.gserviceaccount.com>

Tested-by: kokoro 
Maintainer: Gabe Black 
---
M src/sim/syscall_emul.hh
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Matthew Poremba: Looks good to me, approved
  Gabe Black: Looks good to me, approved
  kokoro: Regressions pass
  Gem5 Cloud Project GCB service account: Regressions pass



diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index e1a23a0..11561a6 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1713,7 +1713,8 @@
 if (p->interpImage.contains(tc->pcState().instAddr())) {
 std::shared_ptr fdep = (*p->fds)[tgt_fd];
 auto ffdp = std::dynamic_pointer_cast(fdep);
-ObjectFile *lib = createObjectFile(ffdp->getFileName());
+ObjectFile *lib = createObjectFile(p->checkPathRedirect(
+ffdp->getFileName()));
 DPRINTF_SYSCALL(Verbose, "Loading symbols from %s\n",
 ffdp->getFileName());


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/27887
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: I33419c78fbf183cda0bba98f7035a2b25ebc6fa3
Gerrit-Change-Number: 27887
Gerrit-PatchSet: 3
Gerrit-Owner: Ciro Santilli 
Gerrit-Reviewer: Brandon Potter 
Gerrit-Reviewer: Ciro Santilli 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Gem5 Cloud Project GCB service account  
<345032938...@cloudbuild.gserviceaccount.com>

Gerrit-Reviewer: Giacomo Travaglini 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Matthew Poremba 
Gerrit-Reviewer: kokoro 
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

[gem5-dev] Change in gem5/gem5[develop]: sim-se: add missing path redirection to mmap createObjectFile

2020-04-16 Thread Ciro Santilli (Gerrit)
Ciro Santilli has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/27887 )



Change subject: sim-se: add missing path redirection to mmap  
createObjectFile

..

sim-se: add missing path redirection to mmap createObjectFile

The redirection call was mistakenly removed at:
Ide158e69cdff19bc81157e3e9826bcabc2a51140 and that breaks running
dynamically linked executables in SE.

JIRA: https://gem5.atlassian.net/browse/GEM5-430

Change-Id: I33419c78fbf183cda0bba98f7035a2b25ebc6fa3
---
M src/sim/syscall_emul.hh
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index e1a23a0..11561a6 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1713,7 +1713,8 @@
 if (p->interpImage.contains(tc->pcState().instAddr())) {
 std::shared_ptr fdep = (*p->fds)[tgt_fd];
 auto ffdp = std::dynamic_pointer_cast(fdep);
-ObjectFile *lib = createObjectFile(ffdp->getFileName());
+ObjectFile *lib = createObjectFile(p->checkPathRedirect(
+ffdp->getFileName()));
 DPRINTF_SYSCALL(Verbose, "Loading symbols from %s\n",
 ffdp->getFileName());


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/27887
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: I33419c78fbf183cda0bba98f7035a2b25ebc6fa3
Gerrit-Change-Number: 27887
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli 
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev