From b7094ec38b8ec2f4de1fdf3d60a0f5953efa3e06 Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Thu, 17 Sep 2009 15:59:43 -0400
Subject: [PATCH] mips: fix command line arguments arguments were not being
 saved correctly into M5 memory

---
 src/arch/mips/linux/process.cc |  6 ---
 src/arch/mips/linux/process.hh |  2 -
 src/arch/mips/process.cc       | 81 ++++++++++++++++++++++++++++++++++
 src/arch/mips/process.hh       |  4 +-
 4 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index 0fa3c382a..dde3a4efd 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -413,12 +413,6 @@ MipsLinuxProcess::MipsLinuxProcess(LiveProcessParams * params,
      Num_Syscall_Descs(sizeof(syscallDescs) / sizeof(SyscallDesc))
 {  }
 
-void
-MipsLinuxProcess::startup()
-{
-    MipsLiveProcess::argsInit(MachineBytes, VMPageSize);
-}
-
 SyscallDesc*
 MipsLinuxProcess::getDesc(int callnum)
 {
diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh
index 5afde2be1..8c45014e0 100644
--- a/src/arch/mips/linux/process.hh
+++ b/src/arch/mips/linux/process.hh
@@ -43,8 +43,6 @@ class MipsLinuxProcess : public MipsLiveProcess
     /// Constructor.
     MipsLinuxProcess(LiveProcessParams * params, ObjectFile *objFile);
 
-    void startup();
-
     virtual SyscallDesc* getDesc(int callnum);
 
     /// The target system's hostname.
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 3e9fb7c20..b9f608922 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,9 +32,15 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
+
 #include "base/loader/object_file.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
+
+#include "mem/page_table.hh"
+
+#include "sim/process.hh"
+#include "sim/process_impl.hh"
 #include "sim/system.hh"
 
 using namespace std;
@@ -62,9 +68,84 @@ MipsLiveProcess::MipsLiveProcess(LiveProcessParams * params,
 void
 MipsLiveProcess::startup()
 {
+    Process::startup();
+
     argsInit(MachineBytes, VMPageSize);
 }
 
+void
+MipsLiveProcess::argsInit(int intSize, int pageSize)
+{
+    // load object file into target memory
+    objFile->loadSections(initVirtMem);
+
+    // Calculate how much space we need for arg & env arrays.
+    int argv_array_size = intSize * (argv.size() + 1);
+    int envp_array_size = intSize * (envp.size() + 1);
+    int arg_data_size = 0;
+    for (vector<string>::size_type i = 0; i < argv.size(); ++i) {
+        arg_data_size += argv[i].size() + 1;
+    }
+    int env_data_size = 0;
+    for (vector<string>::size_type i = 0; i < envp.size(); ++i) {
+        env_data_size += envp[i].size() + 1;
+    }
+
+    int space_needed =
+         argv_array_size + envp_array_size + arg_data_size + env_data_size;
+    if (space_needed < 32*1024)
+        space_needed = 32*1024;
+
+    // set bottom of stack
+    stack_min = stack_base - space_needed;
+    // align it
+    stack_min = roundDown(stack_min, pageSize);
+    stack_size = stack_base - stack_min;
+    // map memory
+    pTable->allocate(stack_min, roundUp(stack_size, pageSize));
+
+    // map out initial stack contents
+    // ========
+    // NOTE: Using uint32_t hardcodes MIPS32 and not MIPS64
+    // even if MIPS64 was intended. This is because the
+    // copyStringArray function templates on the parameters.
+    // Elegant way to check intSize and vary between 32/64?
+    // ========
+    uint32_t argv_array_base = stack_min + intSize; // room for argc
+    uint32_t envp_array_base = argv_array_base + argv_array_size;
+    uint32_t arg_data_base = envp_array_base + envp_array_size;
+    uint32_t env_data_base = arg_data_base + arg_data_size;
+
+    // write contents to stack
+    uint32_t argc = argv.size();
+
+    if (intSize == 8)
+        argc = htog((uint64_t)argc);
+    else if (intSize == 4)
+        argc = htog((uint32_t)argc);
+    else
+        panic("Unknown int size");
+
+
+    initVirtMem->writeBlob(stack_min, (uint8_t*)&argc, intSize);
+
+    copyStringArray(argv, argv_array_base, arg_data_base, initVirtMem);
+
+    copyStringArray(envp, envp_array_base, env_data_base, initVirtMem);
+
+    ThreadContext *tc = system->getThreadContext(contextIds[0]);
+
+    setSyscallArg(tc, 0, argc);
+    setSyscallArg(tc, 1, argv_array_base);
+    tc->setIntReg(StackPointerReg, stack_min);
+
+    Addr prog_entry = objFile->entryPoint();
+    tc->setPC(prog_entry);
+    tc->setNextPC(prog_entry + sizeof(MachInst));
+    tc->setNextNPC(prog_entry + (2 * sizeof(MachInst)));
+}
+
+
 MipsISA::IntReg
 MipsLiveProcess::getSyscallArg(ThreadContext *tc, int i)
 {
diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index 87c62330f..b8f4de20a 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -45,7 +45,9 @@ class MipsLiveProcess : public LiveProcess
   protected:
     MipsLiveProcess(LiveProcessParams * params, ObjectFile *objFile);
 
-    virtual void startup();
+    void startup();
+
+    void argsInit(int intSize, int pageSize);
 
   public:
     MipsISA::IntReg getSyscallArg(ThreadContext *tc, int i);