Brandon Potter has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12126 )
Change subject: sim-se: fix a few bugs/warns from GCC 6
......................................................................
sim-se: fix a few bugs/warns from GCC 6
Change-Id: Ib2ad860324fd234b23262d141be3e82628ff61f0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/12126
Tested-by: kokoro <[email protected]>
Reviewed-by: Brandon Potter <[email protected]>
Maintainer: Brandon Potter <[email protected]>
---
M src/sim/syscall_emul.cc
1 file changed, 3 insertions(+), 6 deletions(-)
Approvals:
Brandon Potter: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index bfec1f5..98fbe96 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -848,12 +848,6 @@
pipeImpl(SyscallDesc *desc, int callnum, Process *p, ThreadContext *tc,
bool pseudoPipe)
{
- Addr tgt_addr = 0;
- if (!pseudoPipe) {
- int index = 0;
- tgt_addr = p->getSyscallArg(tc, index);
- }
-
int sim_fds[2], tgt_fds[2];
int pipe_retval = pipe(sim_fds);
@@ -883,6 +877,9 @@
return tgt_fds[0];
}
+ int index = 0;
+ Addr tgt_addr = p->getSyscallArg(tc, index);
+
/**
* Copy the target file descriptors into buffer space and then copy
* the buffer space back into the target address space.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12126
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: Ib2ad860324fd234b23262d141be3e82628ff61f0
Gerrit-Change-Number: 12126
Gerrit-PatchSet: 24
Gerrit-Owner: Brandon Potter <[email protected]>
Gerrit-Reviewer: Alexandru Duțu <[email protected]>
Gerrit-Reviewer: Brandon Potter <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: John Alsop <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
