imported patch aux-fix.patch

This commit is contained in:
Lisa Hsu 2008-12-07 15:07:42 -05:00
parent e4790bcbe2
commit 993b7be4bb
5 changed files with 10 additions and 14 deletions

View file

@ -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);

View file

@ -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;

View file

@ -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();

View file

@ -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),

View file

@ -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