From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Sun, 7 Feb 2016 01:21:20 +0000 (-0800)
Subject: syscall_emul: fix bug in aux vector initialization
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92b750d5efb56359e3c95ca6bc093ab4b6395aa1;p=gem5.git

syscall_emul: fix bug in aux vector initialization

Writing 16 bytes from an 8-byte source value is a bad idea.
This doesn't appear to have broken anything, but showed up
as spurious differences when tracediffing runs.
---

diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 8d1e1da96..82a23027d 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -983,8 +983,10 @@ X86LiveProcess::argsInit(int pageSize,
     }
     //Write out the terminating zeroed auxilliary vector
     const uint64_t zero = 0;
-    initVirtMem.writeBlob(auxv_array_base + 2 * intSize * auxv.size(),
-            (uint8_t*)&zero, 2 * intSize);
+    initVirtMem.writeBlob(auxv_array_base + auxv.size() * 2 * intSize,
+                          (uint8_t*)&zero, intSize);
+    initVirtMem.writeBlob(auxv_array_base + (auxv.size() * 2 + 1) * intSize,
+                          (uint8_t*)&zero, intSize);
 
     initVirtMem.writeString(aux_data_base, platform.c_str());