From patchwork Wed Jul 3 15:52:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 168423 Delivered-To: patch@linaro.org Received: by 2002:ac9:6410:0:0:0:0:0 with SMTP id r16csp1040073ock; Wed, 3 Jul 2019 08:56:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/n6jJ7d4bB6f8lx4maaV7kK//E25pjh53J5JC6eebjGsPtxHlOspAqcCyVlrotqPVVIsU X-Received: by 2002:a17:906:190e:: with SMTP id a14mr15467559eje.69.1562169370177; Wed, 03 Jul 2019 08:56:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562169370; cv=none; d=google.com; s=arc-20160816; b=0BLXaszoK48vPSwq0Z9lre9ZJp5sAI7Lky3mX3hW59iRuOfeblcWOu0IKuxuqNGDPl /H5PkouTp7CRx5KpwA1yXuWbR3YyjqvmopsDx1hWwEggwiRij+mi0QSWWUMGFcCMDygI TGWiU7Hw89fVvaiGYo7yFG3tQWV3lFfS8TYVJF8HyVeKQZtOM8lVwCHDwTikw56CiR/j 4mwiK6d8KLSsQ/1i5hsJCXd4I5vyxA/21L5DI1K+rrzzNVccKC66lObmYS4N4kWwTlCm pdK0FjBuZVqfo0y6Q1YUtnW/E+dihH55wb/++c9dCn/P5LZ6coEuSUbeY/APXahqsCen 6U8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=m+82LmGiTUR8ft7yGco+ML19JHV1vi8nCqyq/raGSyc=; b=EF5zaY/OaNjmNpYDjDUi1kKMJPq/bZIAGuubP6jwP6PUtPniV04KAS4w2d/Y+qvTV0 Xm3bxBKEpkmQnTAAkUT+KVF3a+8k5VU1dkRORG7X6nPTTpBi4+sJAwKDg1W/OdcSYAKf Z1/ID77IXDCmm00ozA7Wjx6ITfRfk7hFOuMyuTe9doxTp9fHuemrhaxalyTQTbVrP5EB hL6eR0SgkXtAjxKwjjJyzU7qblokd4/qarGHNi5p411oVVu1FLes7gR4W289NSdAPf2/ RcMrv3feD1Y7doIOjmirBb3+geNilHxyiDcmpU/FXlU6DqMraskafu9wmnoqG1lRiadh CH7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amRPd7cN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v17si1997179eju.326.2019.07.03.08.56.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2019 08:56:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=amRPd7cN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihc9-0003tl-4g for patch@linaro.org; Wed, 03 Jul 2019 11:56:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53155) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hihZI-0002hn-Tk for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:53:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hihZF-00078s-HL for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:53:12 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hihZ8-0006vo-T4 for qemu-devel@nongnu.org; Wed, 03 Jul 2019 11:53:04 -0400 Received: by mail-wm1-x342.google.com with SMTP id z23so2960627wma.4 for ; Wed, 03 Jul 2019 08:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m+82LmGiTUR8ft7yGco+ML19JHV1vi8nCqyq/raGSyc=; b=amRPd7cNQqjH1DB4/gfYLm89jy4FPHMN4SDAOTlYl49UMvlwIzlxX3i6kWzHPXmiSc DjKL/i1ujAS4CCsnKlOMTPnLlTnQHXVoF8BDVBJPFQFoUMEgaPfiDrun/2Na4t5itmvD v/6bacFZ8tKCvqrXcua92SnsoRUlVwktfxet3QTAZ4GWlLn9WLAA8oGxuU+J79DSkb7D Jt1KbOXQt2I4bI6ow2MGaVttzfG6pRVbr4cj18WVXKpeYjbk4ZkHCh56kzbaZIktY8yl M3rKxqPT6yGXUgFJfEwRsP7h0HolWwfR0eI27elV5CciYyJFvmd/mezmV9LOrVJzlYM6 eXSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m+82LmGiTUR8ft7yGco+ML19JHV1vi8nCqyq/raGSyc=; b=ocmQfh2MlBKcOfp1jdRHlUa9RIa2mq+EXhwS/9I/LG0ZcR8H+LGKh4jkM/nQB+oPph 7OWQxnmhURCHY61bPN0PJwoq1ix3DlEtU/kmGiXo1XwX49MbJsRzpwxx/Uqhmekgydw0 cI7k3cVGeA7Vt3SDrygHbLmZt95KRIYdY7XNrBzDKsfIT2aNP2l1MkPgIWtxwj9eoVN5 wIf6qwDIUVdLu4xxMOcqIAgAQ1lq0OLzBf1j+0Wn38gH1wPN8IQuJ0/+7qxP+LdZRPpd 04rZcc+ylOhw2QICDgdi2WYSg74iWUgJBKtG6sGEiESBD3HaqlBH1BeXK4UuZQwJ6OHS xDwA== X-Gm-Message-State: APjAAAXIBfCH9j+V/AHMwatsBlF70tGogiwAHkMvvx5zfi6FdSZPaln5 L6vrWEH/XQadI+aJg7K+wOKj7g== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr8879731wmc.77.1562169166227; Wed, 03 Jul 2019 08:52:46 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z17sm2708049wrr.13.2019.07.03.08.52.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 03 Jul 2019 08:52:45 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8E6791FF90; Wed, 3 Jul 2019 16:52:44 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 3 Jul 2019 16:52:43 +0100 Message-Id: <20190703155244.28166-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703155244.28166-1-alex.bennee@linaro.org> References: <20190703155244.28166-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v1 3/4] target/arm: handle A-profile A32 semihosting at translate time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As for the other semihosting calls we can resolve this at translate time. Signed-off-by: Alex Bennée --- target/arm/translate.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/translate.c b/target/arm/translate.c index 8e2e955cbe..139b2f6765 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -7699,6 +7699,22 @@ static void arm_skip_unless(DisasContext *s, uint32_t cond) arm_gen_test_cc(cond ^ 1, s->condlabel); } +static inline void gen_arm_swi(DisasContext *s, int imm24) +{ + if (semihosting_enabled() && +#ifndef CONFIG_USER_ONLY + s->current_el != 0 && +#endif + (imm24 == 0x123456)) { + gen_exception_internal_insn(s, 0, EXCP_SEMIHOST); + return; + } + + gen_set_pc_im(s, s->pc); + s->svc_imm = imm24; + s->base.is_jmp = DISAS_SWI; +} + static void disas_arm_insn(DisasContext *s, unsigned int insn) { unsigned int cond, val, op1, i, shift, rm, rs, rn, rd, sh; @@ -9249,9 +9265,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) break; case 0xf: /* swi */ - gen_set_pc_im(s, s->pc); - s->svc_imm = extract32(insn, 0, 24); - s->base.is_jmp = DISAS_SWI; + gen_arm_swi(s, extract32(insn, 0, 24)); break; default: illegal_op: