diff -r 5fb3262c7a09 -r 041fddc434bb src/arch/arm/faults.cc --- a/src/arch/arm/faults.cc Fri Feb 11 18:39:59 2011 -0600 +++ b/src/arch/arm/faults.cc Fri Feb 11 18:40:45 2011 -0600 @@ -184,14 +184,7 @@ // As of now, there isn't a 32 bit thumb version of this instruction. assert(!machInst.bigThumb); uint32_t callNum; - if (machInst.thumb) { - callNum = bits(machInst, 7, 0); - } else { - callNum = bits(machInst, 23, 0); - } - if (callNum == 0) { - callNum = tc->readIntReg(INTREG_R7); - } + callNum = tc->readIntReg(INTREG_R7); tc->syscall(callNum); // Advance the PC since that won't happen automatically.