From patchwork Wed Aug 28 16:53:01 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: 172406 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1036792ily; Wed, 28 Aug 2019 10:10:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEblDNkKnnJUTLnohQ8spFB2oxvpssx+ESQ88TnrJpioo/3whh/lHSfESsz62TmBeuztRs X-Received: by 2002:ac8:3d41:: with SMTP id u1mr5200783qtf.85.1567012220623; Wed, 28 Aug 2019 10:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567012220; cv=none; d=google.com; s=arc-20160816; b=A/OQk6iWZYWWT26iyPFa4yr6p8XsJMMOIM4FsRpReSYRlt2EZiRT2UaoaFhCnS4flh d0x/RzLLnWU7zjLyq4s8T/G6uUsUANgN7xomGRTG2PaVZAg6gPwxryQm8biTj9VQvF3G tUoqUEnJyKzOI5KbRCFygCdkbbA1zdH0y4w6tmmf3vWeba9Wqoi1AG/eEqWzvrFalQVg Lr9lqIdrLZUOdnTuCZhPkhaL3oIBbvmoNUg44tHqYsZPDcYe2cTMw+mVVI7lTQjdfM5h EwouzWf3rYWqnQtff1hwHQMYpfDI1MZMDiEllofuQfgfrl3/fc+7GC4bT9Z8I7B8W2Ux psZg== 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=b97onG7/lnQlcwo4RqOnNFf+XJUP3+kZkC9XBhFAYJI=; b=LB3Yb2Gi5tD5x6ID0lBZcXdScVtvB2zr71ZSI5Hznl8PM7Jf+scYD/j9ihuale4YH3 b9vBW4XBwTgYHqY8andAk/kVue8M3luBV6mXcl60QWEVIZ283B5p/EIT8hBt9biPhyHM G18nxoPcPf1o2tj8MvKA/G1Y9nK2GMIOxoJKb4OB34eQDfdG0xqgHi7SlT8SulOwzUK9 4mUNw3sVxyyKGyabQyTKDnCjzlD0BMXAy8jO9tiOsY7QJY2tpXcTX212HyyRVKGPUE0f JRQWnOTXFYMgBfihKS9fY3gwwlQxiWUFWxGVAMZS27BW8UsBmEEQxM3SweSlN08/+cB2 Zw9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZH72THi9; 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 h54si2172476qvh.150.2019.08.28.10.10.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 10:10:20 -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=ZH72THi9; 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]:38950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i31Sd-0008FZ-Po for patch@linaro.org; Wed, 28 Aug 2019 13:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i31C7-0007eO-Gg for qemu-devel@nongnu.org; Wed, 28 Aug 2019 12:53:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i31C4-0000rN-Ct for qemu-devel@nongnu.org; Wed, 28 Aug 2019 12:53:14 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:40180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i31C3-0000pb-U1 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 12:53:12 -0400 Received: by mail-wr1-x442.google.com with SMTP id c3so510836wrd.7 for ; Wed, 28 Aug 2019 09:53:11 -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=b97onG7/lnQlcwo4RqOnNFf+XJUP3+kZkC9XBhFAYJI=; b=ZH72THi9x/W/YObwy4Qpze1epX+Kk+NJPpiVhuPYlxtFOWMKpH0qeG5tB7sU5hoXco FG++4ECrZUM+mkwNSaN90j/VeNt85IuG2zKK4MBYAksgxWDlCvy2rkNQayZjOoILI4vA 4P3ICYE/eLxkJtloKi90VdQBNOBvV4C7tpRl7SJMJPZ1bedH9R1w4Vt6FjgZIRmWJnT2 UNvaSuwMpZ43McdD5E6QPZjN1t0nUTn+w2FvvUO1OqT5Rx1S+f+5ZuXYM3PRghfbA59B rDFrAbNGDsFNOVSmJuEaQxFeQEcubyOCTc3c2RuCYnPyYr4pxUd/KEhvnFP/jBzt2HP6 V04A== 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=b97onG7/lnQlcwo4RqOnNFf+XJUP3+kZkC9XBhFAYJI=; b=DaWomsiIHJVJg1H7/v/uOIdAa557nulpnBqicLQ0NGhECZNa+BKDs/jTrZZeEe9VFB aJ2Aw6pTJPd7uA4eIip9JsBDrqfOWuXiwN+Hb7p7WkokcY3mRVOjLpdAuI1yftgYn+qa +tFL62xRkVJEp+PH/Dym8NqKXsNEVmlm7aAdSW6y59V8Be7rNziBX25hSDOviMkNxa+1 tLmjPijXiOYY+NUCnzt0PH7WdIOG42U0+XLhGoh8pKNy3cUWGige1VGRQueHwCCeT9NX iGPuRJPMNRR1Eb0yCM9mzXtnQqephT1nNuAcg/Z1Nkclj7FG6bTwk+RMcILQVgR1JE/3 i44g== X-Gm-Message-State: APjAAAXT38xdXPWuUk8WHG12ntulD//F+LE9w7SYzDhSNOX6FhiCrvgZ aG6Tx+aWgEzFM53AIiraKyoa3Q== X-Received: by 2002:a5d:4108:: with SMTP id l8mr5822642wrp.113.1567011190801; Wed, 28 Aug 2019 09:53:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 24sm2124289wmf.10.2019.08.28.09.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 09:53:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A42D71FF90; Wed, 28 Aug 2019 17:53:07 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 17:53:01 +0100 Message-Id: <20190828165307.18321-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190828165307.18321-1-alex.bennee@linaro.org> References: <20190828165307.18321-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::442 Subject: [Qemu-devel] [PATCH v1 3/9] 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: Richard Henderson , "open list:ARM TCG CPUs" , =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell 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 Reviewed-by: Richard Henderson --- target/arm/translate.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/target/arm/translate.c b/target/arm/translate.c index 6157e9f52fc..9dc7ec78061 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -7657,6 +7657,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->base.pc_next); + 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; @@ -9195,9 +9211,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) break; case 0xf: /* swi */ - gen_set_pc_im(s, s->base.pc_next); - 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: