From 3951afd2fa6140f85a94c9636ac2d9e9d3a1c764 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 2 Jun 2010 12:58:00 -0500 Subject: ARM: Detect thumb mode elf images. --- src/sim/process.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/sim/process.cc') diff --git a/src/sim/process.cc b/src/sim/process.cc index 957c3cc3e..18f33abdc 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -755,14 +755,18 @@ LiveProcess::create(LiveProcessParams * params) fatal("Unknown/unsupported operating system."); } #elif THE_ISA == ARM_ISA - if (objFile->getArch() != ObjectFile::Arm) + if (objFile->getArch() != ObjectFile::Arm && + objFile->getArch() != ObjectFile::Thumb) fatal("Object file architecture does not match compiled ISA (ARM)."); switch (objFile->getOpSys()) { case ObjectFile::UnknownOpSys: warn("Unknown operating system; assuming Linux."); // fall through case ObjectFile::Linux: - process = new ArmLinuxProcess(params, objFile); + if (objFile->getArch() == ObjectFile::Thumb) + panic("Thumb processes not yet supported.\n"); + else + process = new ArmLinuxProcess(params, objFile); break; case ObjectFile::LinuxArmOABI: fatal("M5 does not support ARM OABI binaries. Please recompile with an" -- cgit v1.2.3