From: Joe Gross <joseph.gross@amd.com>
Date: Wed, 18 Apr 2018 21:59:50 +0000 (-0400)
Subject: sim-se: fix a few bugs/warns from GCC 6
X-Git-Tag: v19.0.0.0~885
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f75351acd7d518dddd1b2205bce529232cc9d43d;p=gem5.git

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 <noreply+kokoro@google.com>
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
---

diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index bfec1f5a5..98fbe96a0 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -848,12 +848,6 @@ SyscallReturn
 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 @@ pipeImpl(SyscallDesc *desc, int callnum, Process *p, ThreadContext *tc,
         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.