From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1DcE-0004HZ-3k for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:40:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1DcB-0005AD-VW for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:40:46 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:40686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1DcB-0005A9-Oe for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:40:43 -0400 From: Peter Maydell Date: Tue, 14 Aug 2012 10:40:36 +0100 Message-Id: <1344937236-611-11-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1344937236-611-1-git-send-email-peter.maydell@linaro.org> References: <1344937236-611-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 10/10] linux-user: ARM: Ignore immediate value for svc in thumb mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Blue Swirl Cc: Riku Voipio , qemu-devel@nongnu.org From: Alexander Graf When running in thumb mode, Linux doesn't evaluate the immediate value of the svc instruction, but instead just always assumes the syscall number to be in r7. This fixes executing go_bootstrap while building go for me. Signed-off-by: Alexander Graf Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- linux-user/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 63c1249..7dea084 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -822,8 +822,7 @@ void cpu_loop(CPUARMState *env) } else if (n == ARM_NR_semihosting || n == ARM_NR_thumb_semihosting) { env->regs[0] = do_arm_semihosting (env); - } else if (n == 0 || n >= ARM_SYSCALL_BASE - || (env->thumb && n == ARM_THUMB_SYSCALL)) { + } else if (n == 0 || n >= ARM_SYSCALL_BASE || env->thumb) { /* linux syscall */ if (env->thumb || n == 0) { n = env->regs[7]; -- 1.7.9.5