sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This patch pulls out the auxiliary vector struct from individual ISA

Browse source 
LiveProcesses to the base LiveProcess definition so anyone can use them.
This commit is contained in:
Lisa Hsu 2008-12-04 18:03:35 -05:00
parent 041ca19edc
commit e2c7618e50
5 changed files with 29 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/arch/sparc/process.hh
View file

@ -71,26 +71,6 @@ class SparcLiveProcess : public LiveProcess
virtual void flushWindows(ThreadContext *tc) = 0;
};
template<class IntType>
struct M5_auxv_t
{
IntType a_type;
union {
IntType a_val;
IntType a_ptr;
IntType a_fcn;
};
M5_auxv_t()
{}
M5_auxv_t(IntType type, IntType val)
{
a_type = SparcISA::htog(type);
a_val = SparcISA::htog(val);
}
};
class Sparc32LiveProcess : public SparcLiveProcess
{
protected:

9
src/arch/x86/process.cc
View file

@ -103,11 +103,6 @@
using namespace std;
using namespace X86ISA;
M5_64_auxv_t::M5_64_auxv_t(int64_t type, int64_t val)
{
a_type = X86ISA::htog(type);
a_val = X86ISA::htog(val);
}
X86LiveProcess::X86LiveProcess(LiveProcessParams * params,
ObjectFile *objFile)
@ -205,7 +200,9 @@ X86LiveProcess::startup()
void
X86LiveProcess::argsInit(int intSize, int pageSize)
{
typedef M5_64_auxv_t auxv_t;
typedef M5_auxv_t<uint64_t> auxv_t;
std::vector<auxv_t> auxv;
Process::startup();
string filename;

16
src/arch/x86/process.hh
View file

@ -64,26 +64,10 @@
namespace X86ISA
{
struct M5_64_auxv_t
{
int64_t a_type;
union {
int64_t a_val;
int64_t a_ptr;
int64_t a_fcn;
};
M5_64_auxv_t()
{}
M5_64_auxv_t(int64_t type, int64_t val);
};
class X86LiveProcess : public LiveProcess
{
protected:
std::vector<M5_64_auxv_t> auxv;
X86LiveProcess(LiveProcessParams * params, ObjectFile *objFile);
void startup();

10
src/sim/process.cc
View file

@ -86,6 +86,16 @@ using namespace TheISA;
// current number of allocated processes
int num_processes = 0;
template<class IntType>
M5_auxv_t<IntType>::M5_auxv_t(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>;
Process::Process(ProcessParams * params)
: SimObject(params), system(params->system), checkpointRestored(false),
max_stack_size(params->max_stack_size)

16
src/sim/process.hh
View file

@ -61,6 +61,22 @@ namespace TheISA
class RemoteGDB;
}
template<class IntType>
struct M5_auxv_t
{
IntType a_type;
union {
IntType a_val;
IntType a_ptr;
IntType a_fcn;
};
M5_auxv_t()
{}
M5_auxv_t(IntType type, IntType val);
};
class Process : public SimObject
{
public: