diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
| commit | 71835d42df8fb488380be8cc89be4298b268902a (patch) | |
| tree | 7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/sim/process.cc | |
| parent | 2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff) | |
| parent | 4c7eb211191055f72c6f157913cb384f47cf4334 (diff) | |
| download | gem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz | |
Automated merge with file:/home/stever/hg/m5-orig
--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/sim/process.cc')
| -rw-r--r-- | src/sim/process.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc index d83b0247e..16037b2f4 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -61,6 +61,8 @@ #include "arch/sparc/solaris/process.hh" #elif THE_ISA == MIPS_ISA #include "arch/mips/linux/process.hh" +#elif THE_ISA == ARM_ISA +#include "arch/arm/linux/process.hh" #elif THE_ISA == X86_ISA #include "arch/x86/linux/process.hh" #else @@ -700,6 +702,17 @@ LiveProcess::create(LiveProcessParams * params) default: fatal("Unknown/unsupported operating system."); } +#elif THE_ISA == ARM_ISA + if (objFile->getArch() != ObjectFile::Arm) + fatal("Object file architecture does not match compiled ISA (ARM)."); + switch (objFile->getOpSys()) { + case ObjectFile::Linux: + process = new ArmLinuxProcess(params, objFile); + break; + + default: + fatal("Unknown/unsupported operating system."); + } #else #error "THE_ISA not set" #endif |