From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZN1uv-0001dX-9t for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:51:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZN1ur-0004sK-3j for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:51:49 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:55156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZN1uq-0004sF-UO for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:51:45 -0400 From: Christopher Covington Date: Wed, 5 Aug 2015 12:51:10 -0400 Message-Id: <1438793483-12721-2-git-send-email-cov@codeaurora.org> In-Reply-To: <1438793483-12721-1-git-send-email-cov@codeaurora.org> References: <1438793483-12721-1-git-send-email-cov@codeaurora.org> Subject: [Qemu-devel] [RFC 01/14] Make unknown semihosting calls non-fatal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christopher Covington Signed-off-by: Christopher Covington --- target-arm/arm-semi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index a8b83e6..bcc70ec 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -186,8 +186,6 @@ static void arm_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err) #define SET_ARG(n, val) put_user_ual(val, args + (n) * 4) uint32_t do_arm_semihosting(CPUARMState *env) { - ARMCPU *cpu = arm_env_get_cpu(env); - CPUState *cs = CPU(cpu); target_ulong args; target_ulong arg0, arg1, arg2, arg3; char * s; @@ -195,6 +193,8 @@ uint32_t do_arm_semihosting(CPUARMState *env) uint32_t ret; uint32_t len; #ifdef CONFIG_USER_ONLY + ARMCPU *cpu = arm_env_get_cpu(env); + CPUState *cs = CPU(cpu); TaskState *ts = cs->opaque; #else CPUARMState *ts = env; @@ -562,7 +562,6 @@ uint32_t do_arm_semihosting(CPUARMState *env) exit(ret); default: fprintf(stderr, "qemu: Unsupported SemiHosting SWI 0x%02x\n", nr); - cpu_dump_state(cs, stderr, fprintf, 0); - abort(); + return -1; } } -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project