imported patch aux-fix.patch

diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 3e5851e742452a3a6ae3cb96cec4606f5345150b..004be1ec0a7919b8d6af25bcdb20c38da722bf18 100644 (file)
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -67,7 +67,7 @@ AlphaLiveProcess::argsInit(int intSize, int pageSize)
 {
     objFile->loadSections(initVirtMem);
 
-    typedef M5_auxv_t<uint64_t> auxv_t;
+    typedef AuxVector<uint64_t> auxv_t;
     std::vector<auxv_t>  auxv;
 
     ElfObject * elfObject = dynamic_cast<ElfObject *>(objFile);

diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 987e0465e6e50a395a8a8548a0f52eba3ea80177..91baea40c4ebef704d770db6a363b9940e04b664 100644 (file)
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -189,7 +189,7 @@ SparcLiveProcess::argsInit(int pageSize)
 {
     int intSize = sizeof(IntType);
 
-    typedef M5_auxv_t<IntType> auxv_t;
+    typedef AuxVector<IntType> auxv_t;
 
     std::vector<auxv_t> auxv;
 

diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 8d0cd5038dfe8789f56c92a572c7323f4d3e1ea4..2013190ebd24e8e320b6667385e3f4229fa857f5 100644 (file)
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -200,7 +200,7 @@ X86LiveProcess::startup()
 void
 X86LiveProcess::argsInit(int intSize, int pageSize)
 {
-    typedef M5_auxv_t<uint64_t> auxv_t;
+    typedef AuxVector<uint64_t> auxv_t;
     std::vector<auxv_t>  auxv;
 
     Process::startup();

diff --git a/src/sim/process.cc b/src/sim/process.cc
index 244fb92977d9b9da8192ab1f73149f8481230c9c..a1f4c7d1d77e87243499cd974eab93bf631cebfd 100644 (file)
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -87,14 +87,14 @@ using namespace TheISA;
 int num_processes = 0;
 
 template<class IntType>
-M5_auxv_t<IntType>::M5_auxv_t(IntType type, IntType val)
+AuxVector<IntType>::AuxVector(IntType type, IntType val)
 {
     a_type = TheISA::htog(type);
     a_val = TheISA::htog(val);
 }
 
-template class M5_auxv_t<uint32_t>;
-template class M5_auxv_t<uint64_t>;
+template class AuxVector<uint32_t>;
+template class AuxVector<uint64_t>;
 
 Process::Process(ProcessParams * params)
     : SimObject(params), system(params->system), checkpointRestored(false),

diff --git a/src/sim/process.hh b/src/sim/process.hh
index 99666384786f94694335a4eefaa807f94de4f5f1..e6b7c80b7b425bab3edb9fed01a57996ab339a20 100644 (file)
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -62,19 +62,15 @@ namespace TheISA
 }
 
 template<class IntType>
-struct M5_auxv_t
+struct AuxVector
 {
     IntType a_type;
-    union {
-        IntType a_val;
-        IntType a_ptr;
-        IntType a_fcn;
-    };
+    IntType a_val;
 
-    M5_auxv_t()
+    AuxVector()
     {}
 
-    M5_auxv_t(IntType type, IntType val);
+    AuxVector(IntType type, IntType val);
 };
 
 class Process : public SimObject