From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Wed, 23 Feb 2011 21:10:48 +0000 (-0600)
Subject: ARM: Delete OABI syscall handling.
X-Git-Tag: stable_2012_02_02~543
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e572cf93ee411ef40acdb64eb3073231619862ed;p=gem5.git

ARM: Delete OABI syscall handling.

We only support EABI binaries, so there is no reason to support OABI syscalls.
The loader detects OABI calls and fatal() so there is no reason to even check
here.
---

diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 54cf5cfe5..e388c72a8 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -184,14 +184,7 @@ SupervisorCall::invoke(ThreadContext *tc, StaticInstPtr inst)
     // 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.