From patchwork Wed Sep 4 11:21:04 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: 11129883 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 336181399 for ; Wed, 4 Sep 2019 11:22:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0965622CED for ; Wed, 4 Sep 2019 11:22:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H7t/DE89" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0965622CED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TN5-0000MX-1F for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 07:22:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TLf-00076E-Pr for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TLd-0007E1-Fx for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:15 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:37870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TLd-0007Cl-8D for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:13 -0400 Received: by mail-wm1-x335.google.com with SMTP id r195so3238684wme.2 for ; Wed, 04 Sep 2019 04:21:13 -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=k8unDVXpqLg5lphwGOo47n1fiubp2aXlLo/SotwPOPg=; b=H7t/DE89yjsHHkLoLe7eOvU/ei+v20trln0fY4LNKV62HDVgcVHpCl9AF/cZWjBV23 6kbK3qBEt9zti5fO7MMqIyHHCBMH4dVEbM/6mD/PwnL0YBX65K18AcMyRLZcfgjHH/RR YsI8cz9c84iTUSMjB+H0W7HeG8H7tdNSQtyVjYa8eZF+9h2Rkkrhcct/5rxneVuTjpjm exJVpnc9rptHamN/Q9pl7bFcKgN1K5s+K6gQl6Gyt3No+wFLr6Jq2IvWKesCFl4PhPHO ao3hu4++24FvHJB6Nx5/xmMcQkdCm2vNG0+J3K51b3W8hcALWygKLRbCAIi1TlrIuGNb dpOw== 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=k8unDVXpqLg5lphwGOo47n1fiubp2aXlLo/SotwPOPg=; b=gCMUeH7spdsH4mjBoCDrjjcUsDoWynTmJwQX9GuTmaBbr/thzvXwJzP4Of2HB0Wgq2 4XLNQRO2f2PxHjqqNdFWEEnM73fk0qF3qooFaXeeGKhimmMBuBP3AKuwdh3wYbZlqvTo 68CfsAsasPdTZYb6dDSl6cZy9MZnYM6h2ydnXbOa4IFgyhkLrqGXX0bixm8gs+IiaJ48 0EwxYDIlK3bAJ3DoatryO+81j+dKqjV3ucYlc2zEQrss9D/QjWOmQc4YLNzGpfAMRDRJ GR7wntjhoFatkMwHzy55miuoI0dvy+iBSwYwDAvpDHEncn+UCAf5RJp/uK1RoU3BJijQ MEXg== X-Gm-Message-State: APjAAAXPHHSwkC60DGhZqQlZeHflOYgDnMa8zrn45w+PghsbJTX1CFJ/ NSaL7eKvgbZfuETLwWVjBPJgsA== X-Google-Smtp-Source: APXvYqyuFhHQiqR0kX2pHqQwIyVV7skqXZgITrH/Rls16fRUbG4UNJvg6viyP2NAYOW7kDpIanGB+w== X-Received: by 2002:a1c:e709:: with SMTP id e9mr3987262wmh.65.1567596072093; Wed, 04 Sep 2019 04:21:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a205sm1678669wmd.44.2019.09.04.04.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 04:21:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 23C091FF8C; Wed, 4 Sep 2019 12:21:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:21:04 +0100 Message-Id: <20190904112108.2341-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904112108.2341-1-alex.bennee@linaro.org> References: <20190904112108.2341-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::335 Subject: [Qemu-devel] [PATCH v2 1/5] target/arm: handle M-profile 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 , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We do this for other semihosting calls so we might as well do it for M-profile as well. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - update for change to gen_exception_internal_insn API --- target/arm/m_helper.c | 18 ++++++------------ target/arm/translate.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index 884d35d2b02..27cd2f3f964 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -2114,19 +2114,13 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) break; } break; + case EXCP_SEMIHOST: + qemu_log_mask(CPU_LOG_INT, + "...handling as semihosting call 0x%x\n", + env->regs[0]); + env->regs[0] = do_arm_semihosting(env); + return; case EXCP_BKPT: - if (semihosting_enabled()) { - int nr; - nr = arm_lduw_code(env, env->regs[15], arm_sctlr_b(env)) & 0xff; - if (nr == 0xab) { - env->regs[15] += 2; - qemu_log_mask(CPU_LOG_INT, - "...handling as semihosting call 0x%x\n", - env->regs[0]); - env->regs[0] = do_arm_semihosting(env); - return; - } - } armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG, false); break; case EXCP_IRQ: diff --git a/target/arm/translate.c b/target/arm/translate.c index 615859e23c5..816d46b2205 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10931,6 +10931,24 @@ illegal_op: unallocated_encoding(s); } +/* + * Thumb BKPT. On M-profile CPUs this may be a semihosting call which + * we can process much the same way as gen_hlt() above. + */ +static inline void gen_thumb_bkpt(DisasContext *s, int imm8) +{ + if (arm_dc_feature(s, ARM_FEATURE_M) && + semihosting_enabled() && +#ifndef CONFIG_USER_ONLY + s->current_el != 0 && +#endif + (imm8 == 0xab)) { + gen_exception_internal_insn(s, s->base.pc_next, EXCP_SEMIHOST); + return; + } + gen_exception_bkpt_insn(s, syn_aa32_bkpt(imm8, true)); +} + static void disas_thumb_insn(DisasContext *s, uint32_t insn) { uint32_t val, op, rm, rn, rd, shift, cond; @@ -11553,7 +11571,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) { int imm8 = extract32(insn, 0, 8); ARCH(5); - gen_exception_bkpt_insn(s, syn_aa32_bkpt(imm8, true)); + gen_thumb_bkpt(s, imm8); break; } From patchwork Wed Sep 4 11:21:05 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: 11129885 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4106E1398 for ; Wed, 4 Sep 2019 11:24:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1596222CED for ; Wed, 4 Sep 2019 11:24:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="O6FI0Ztt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1596222CED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TOm-0001xu-9F for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 07:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36451) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TLe-00075u-0V for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TLc-0007CP-E4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:13 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35645) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TLc-0007Ap-5Q for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:12 -0400 Received: by mail-wr1-x442.google.com with SMTP id g7so20864871wrx.2 for ; Wed, 04 Sep 2019 04:21: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=9Ge+XWvDG5sVV+m6AqlxOZT4JsJcjtpuvEGkiH2jJk8=; b=O6FI0ZttUEpi5a4oug0HoQfV6DRGdNK+GZszcdX5dQF7NiZt0pYxYhxgVbqMM7szEh frWqJBi/TEbAPrEojO2s3c2R1Xly5GoLYZMl8KpSkwPBxWnPH9V5DCzPc5067bijH+7k 3pqZnv1W3FkdEVv9Nl3fshQRD/btVt+4ODDYxm5uxoY4SfGFzp3GNEweO5rZPOWyamXJ /pcBveE8CUAS4k8IhfBL+5Z77kfRE4WXsXK622CTPiOrHxuOt9dr1WX5qcyiR9NB7kq6 jDNpOdas04QvODYmb/QNgcsawpvCA/hl2B8DL1swVHIbhPO9f5yXIoXd+dqMqHrfAUYc Xz3Q== 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=9Ge+XWvDG5sVV+m6AqlxOZT4JsJcjtpuvEGkiH2jJk8=; b=I9/X7Aj7VFV+g6sp4eH2hNUBxe0sXIkFMqL85WhN9053SfAIhl5jett1Ez6/NrvFhW UOuPkvbfqxwVcMH/GVfQLzUM20jg++7j407dsMnPvzzS+JL6djWhM2QyEkIe7FGSKLXV dxzPYDJnxPHsouKWkzpAJtzhmEbIU83lROkBTK6Mxs+hnogWrURkgDl/c+umQ+s58U3C FDV6nqTZ2dSA72eDhSjAcAQUdBWSSY0zXbpdomISPuCCLzAO7TSRYZYm4Zvl9b8ckHOL UHrMydPWJmXT/BGPKIbXkQwXdiXFscvMLbD00qx9sb6mgjqs8MnPDolh39k3Yy3op3uZ qULw== X-Gm-Message-State: APjAAAVjrCP5Z0Z9lKAFtKyrO/oEzrtREXjZtiXRDaXKu/JhIRdhIhEx mjvTtoDxAWsXt1jabcMy8lJ6JQ== X-Google-Smtp-Source: APXvYqwlKadfVsjIOAoPStal5zo8aeWOPbDSSAco0c4AsV8rkYUNhaYEksSW8u9OyBsklS1yC6nylw== X-Received: by 2002:adf:a382:: with SMTP id l2mr46472685wrb.194.1567596070494; Wed, 04 Sep 2019 04:21:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm27729634wrh.28.2019.09.04.04.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 04:21:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 388951FF8F; Wed, 4 Sep 2019 12:21:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:21:05 +0100 Message-Id: <20190904112108.2341-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904112108.2341-1-alex.bennee@linaro.org> References: <20190904112108.2341-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 v2 2/5] target/arm: handle A-profile T32 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 , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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 --- v2 - update for change to gen_exception_internal_insn API --- target/arm/translate.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 816d46b2205..673994ed1a1 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -10949,6 +10949,24 @@ static inline void gen_thumb_bkpt(DisasContext *s, int imm8) gen_exception_bkpt_insn(s, syn_aa32_bkpt(imm8, true)); } +/* + * Thumb SWI. On A-profile CPUs this may be a semihosting call. + */ +static inline void gen_thumb_swi(DisasContext *s, int imm8) +{ + if (semihosting_enabled() && +#ifndef CONFIG_USER_ONLY + s->current_el != 0 && +#endif + (imm8 == 0xab)) { + gen_exception_internal_insn(s, s->base.pc_next, EXCP_SEMIHOST); + return; + } + gen_set_pc_im(s, s->base.pc_next); + s->svc_imm = imm8; + s->base.is_jmp = DISAS_SWI; +} + static void disas_thumb_insn(DisasContext *s, uint32_t insn) { uint32_t val, op, rm, rn, rd, shift, cond; @@ -11700,10 +11718,8 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn) goto undef; if (cond == 0xf) { - /* swi */ - gen_set_pc_im(s, s->base.pc_next); - s->svc_imm = extract32(insn, 0, 8); - s->base.is_jmp = DISAS_SWI; + /* swi/svc */ + gen_thumb_swi(s, extract32(insn, 0, 8)); break; } /* generate a conditional jump to next instruction */ From patchwork Wed Sep 4 11:21:06 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: 11129887 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E5261399 for ; Wed, 4 Sep 2019 11:24:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 44ABC22CED for ; Wed, 4 Sep 2019 11:24:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="c0iTk3h8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44ABC22CED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TOu-0002Av-Bd for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 07:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TLh-00076e-3X for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TLe-0007Fl-Ma for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:16 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TLd-0007DS-V6 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:14 -0400 Received: by mail-wr1-x441.google.com with SMTP id u16so20841823wrr.0 for ; Wed, 04 Sep 2019 04:21:13 -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=HTKrWQY9yW6MYIS8zgDhcyDleaXQJ6g1pyLY7/mvmEw=; b=c0iTk3h8iuUJigERyboXNR8krGbUfi2N/BJbQAAqiN2gVHFbxSzQ1aZiU08kNEoWy8 4a2eHIIl8eK7TlwnW3bXUEu5P+iN3HoADHWKk4LYy8QXzYVrZG3bzeP1Y8HDPjGMlneT 1Q/P4UfhWTvUOzoDmmexTdCZ0lIBsOvjN5gjcyTYdCVr0Frb78YCp+3yf+AccB36cAOE cKpg/lMJYT1PkYa6qij15ENcHl8kWD61TmlanUFgDgmeT313jq/3OONETde3sA+uTgQ4 Jh2fm9KgYA/eFY/YcMwzRp32NCXG/qDXiZSKsCp4ZyhKGX2/FnHs6zbnsGcWreqizfXX un2w== 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=HTKrWQY9yW6MYIS8zgDhcyDleaXQJ6g1pyLY7/mvmEw=; b=ITh4QnGPFj0Oy/kWELjGV+nHiHRsGOVVDk30v0o9UTANm6neJ+UecI6OzogaKftTcM VX6xu2XbHyWdlOfUIjkTqGLcnzpPnqx0M4FvaX04EL6dvzMGK1XSeDZMp5ILaWNV91Xy FRx3yqOMbagT6c133wTW2epUJrCbfNNx0zH267RioFt3MIeyY2X1uABICC1a/x6wTDDs CS/zsm4a0yJgaD7nkgKT5FLBEGGoeL8NLdOiqRkJCtm/GBOY/TGPEIO6ZbWcOlPSj8O+ AnTWSzeZ6PSBwMP7hM8IriMkMrbn00qfqzHn7FEQnNDtt2ITdCNlNVPJ7hVZnU4TCEVA WMZg== X-Gm-Message-State: APjAAAU4c/bRjNJRnL9J9CgH6I80d8FgKitNySa7TBnydmv1Ft2CH82x swyUMUkFvnbQiSKCtGzyb17vHegJVyQ= X-Google-Smtp-Source: APXvYqyhVYVo9Sh1Qb5fAsB49h9hBBGmoeZ5uonuj4JT2NqqsVPRk7HuWZ1RLOwET2t2HBgPQYetwQ== X-Received: by 2002:a5d:5606:: with SMTP id l6mr20200805wrv.108.1567596072636; Wed, 04 Sep 2019 04:21:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n12sm2582678wmc.24.2019.09.04.04.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 04:21:10 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4E1AF1FF90; Wed, 4 Sep 2019 12:21:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:21:06 +0100 Message-Id: <20190904112108.2341-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904112108.2341-1-alex.bennee@linaro.org> References: <20190904112108.2341-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::441 Subject: [Qemu-devel] [PATCH v2 3/5] 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 , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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 --- v2 - update for change to gen_exception_internal_insn API --- target/arm/translate.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 673994ed1a1..03396a1dde3 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -7683,6 +7683,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, s->base.pc_next, 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; @@ -9230,9 +9246,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: From patchwork Wed Sep 4 11:21:07 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: 11129889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10CB61399 for ; Wed, 4 Sep 2019 11:26:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D89D323401 for ; Wed, 4 Sep 2019 11:26:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eeOTZqfh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D89D323401 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TQi-00049x-VB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 07:26:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TLm-0007AG-5v for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TLf-0007Gq-Fr for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:20 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TLe-0007F9-SL for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:15 -0400 Received: by mail-wr1-x442.google.com with SMTP id h7so19500881wrt.13 for ; Wed, 04 Sep 2019 04:21:14 -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=zlpCkLPxW/plsVCAFKM/m8fldNY7IYpuz4hZ7EfXmKg=; b=eeOTZqfhp+fZCWHGhlEfoezZW0+2kDDeDLOAbfbYc0qJYMPscW29iQViYkH0GukIFl q1pq0YOX74QJSER1AyzBmI/oHm8/KPigWaei/6huZzIHFoiuh4nwJkOhArcREpVw+47U iXcuIiR2jHvEDEvr745+tNY+sfmCoEmt4DwRewgWM17oKfR61+SU6BU9WUXNtPULeVCI RI/WSkXhSA8Gj8i65fpIfGHBxe2saZ4UYX5AD7vR9ELd7EPClEDDoKJ2Dob6nwF7ALSV RMFMl8KpZazAbiDsnRjqWrKNL1n0oeJdhujyJwURMxQLfVfO8sRdDEBkkWmzNvLTysev 4dJw== 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=zlpCkLPxW/plsVCAFKM/m8fldNY7IYpuz4hZ7EfXmKg=; b=pwceHJmbscCRulKwuAXn9CSi5x2G2RxsZ9qQEcPaBTcghrGwAkOwQoe5yL6ScXs9/5 IHvD6P3BIQPRbuF3gCazHCst29En21aoypSmKnWPSrkYfuyKlnL0vbvSlcjMWVz6dK8T Ekc6oQ+z/Niz1f8QMPF+SVCYEanPsWcTVQsH1unrRWcNZbC2rAIL2wGppWt//BgMOnzF TXdv/kwzMfsbobRyhtt6pDE2KSJuBruio93/HZd94+dQ1fcSBCM7+5q5c0l+7x2GJaRI EQCOnxEr6aug1qIyyLpqb+PpqaQi7ookxtQreZQiiH3aQojhlJLa3ja07sG1ZilYFQAP UHpA== X-Gm-Message-State: APjAAAWw+iRopJWq6Jh3dNGGcXlDITX6tIKSK8jRmPKFkFQXVVsedBon PfIEca+j+teoZVW5HRC77gDDAA== X-Google-Smtp-Source: APXvYqwQVjoH8hI29Q33t64FvtyLFiDXcfbgxQ5GiHUAYsBYriWU42Hcb27Ul6ZOYQ8+oHbJMnZrgA== X-Received: by 2002:adf:a350:: with SMTP id d16mr31194562wrb.326.1567596073675; Wed, 04 Sep 2019 04:21:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y72sm5097353wmc.26.2019.09.04.04.21.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 04:21:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6781E1FF91; Wed, 4 Sep 2019 12:21:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:21:07 +0100 Message-Id: <20190904112108.2341-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904112108.2341-1-alex.bennee@linaro.org> References: <20190904112108.2341-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 v2 4/5] target/arm: remove run time semihosting checks 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 , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Now we do all our checking and use a common EXCP_SEMIHOST for semihosting operations we can make helper code a lot simpler. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - fix re-base conflicts - hoist EXCP_SEMIHOST check - comment cleanups v5 - move CONFIG_TCG ifdefs --- target/arm/helper.c | 96 +++++++++++---------------------------------- 1 file changed, 22 insertions(+), 74 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 507026c9154..a87ae6d46a1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8339,88 +8339,32 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) new_el, env->pc, pstate_read(env)); } -static inline bool check_for_semihosting(CPUState *cs) -{ +/* + * Do semihosting call and set the appropriate return value. All the + * permission and validity checks have been done at translate time. + * + * We only see semihosting exceptions in TCG only as they are not + * trapped to the hypervisor in KVM. + */ #ifdef CONFIG_TCG - /* Check whether this exception is a semihosting call; if so - * then handle it and return true; otherwise return false. - */ +static void handle_semihosting(CPUState *cs) +{ ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; if (is_a64(env)) { - if (cs->exception_index == EXCP_SEMIHOST) { - /* This is always the 64-bit semihosting exception. - * The "is this usermode" and "is semihosting enabled" - * checks have been done at translate time. - */ - qemu_log_mask(CPU_LOG_INT, - "...handling as semihosting call 0x%" PRIx64 "\n", - env->xregs[0]); - env->xregs[0] = do_arm_semihosting(env); - return true; - } - return false; + qemu_log_mask(CPU_LOG_INT, + "...handling as semihosting call 0x%" PRIx64 "\n", + env->xregs[0]); + env->xregs[0] = do_arm_semihosting(env); } else { - uint32_t imm; - - /* Only intercept calls from privileged modes, to provide some - * semblance of security. - */ - if (cs->exception_index != EXCP_SEMIHOST && - (!semihosting_enabled() || - ((env->uncached_cpsr & CPSR_M) == ARM_CPU_MODE_USR))) { - return false; - } - - switch (cs->exception_index) { - case EXCP_SEMIHOST: - /* This is always a semihosting call; the "is this usermode" - * and "is semihosting enabled" checks have been done at - * translate time. - */ - break; - case EXCP_SWI: - /* Check for semihosting interrupt. */ - if (env->thumb) { - imm = arm_lduw_code(env, env->regs[15] - 2, arm_sctlr_b(env)) - & 0xff; - if (imm == 0xab) { - break; - } - } else { - imm = arm_ldl_code(env, env->regs[15] - 4, arm_sctlr_b(env)) - & 0xffffff; - if (imm == 0x123456) { - break; - } - } - return false; - case EXCP_BKPT: - /* See if this is a semihosting syscall. */ - if (env->thumb) { - imm = arm_lduw_code(env, env->regs[15], arm_sctlr_b(env)) - & 0xff; - if (imm == 0xab) { - env->regs[15] += 2; - break; - } - } - return false; - default: - return false; - } - qemu_log_mask(CPU_LOG_INT, "...handling as semihosting call 0x%x\n", env->regs[0]); env->regs[0] = do_arm_semihosting(env); - return true; } -#else - return false; -#endif } +#endif /* Handle a CPU exception for A and R profile CPUs. * Do any appropriate logging, handle PSCI calls, and then hand off @@ -8451,13 +8395,17 @@ void arm_cpu_do_interrupt(CPUState *cs) return; } - /* Semihosting semantics depend on the register width of the - * code that caused the exception, not the target exception level, - * so must be handled here. + /* + * Semihosting semantics depend on the register width of the code + * that caused the exception, not the target exception level, so + * must be handled here. */ - if (check_for_semihosting(cs)) { +#ifdef CONFIG_TCG + if (cs->exception_index == EXCP_SEMIHOST) { + handle_semihosting(cs); return; } +#endif /* Hooks may change global state so BQL should be held, also the * BQL needs to be held for any modification of From patchwork Wed Sep 4 11:21:08 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: 11129891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B36A1398 for ; Wed, 4 Sep 2019 11:26:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4CCA22DBF for ; Wed, 4 Sep 2019 11:26:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XNsblw+i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4CCA22DBF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TQj-00049G-10 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 07:26:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36597) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5TLm-0007AF-56 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5TLg-0007I9-J7 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:20 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42823) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5TLf-0007Fr-RD for qemu-devel@nongnu.org; Wed, 04 Sep 2019 07:21:16 -0400 Received: by mail-wr1-x42e.google.com with SMTP id q14so1454227wrm.9 for ; Wed, 04 Sep 2019 04:21:15 -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=hEwLxmZ1/l0uu9kShjHwMMLEdP39KievYwY8GQL60m8=; b=XNsblw+iMOyRPzzXve5u68TAeQ+Sx5Dsce1UtFH07Fmmy+EtvXely+vmRk000jX0Mu +W7U666lhSQc3xfYdvhvU+DM/w3EYVHmarZZWSnA/KWs8SkTDtV6cqP4aINY6SCyTGCb lI2vk5e++XC6w2yfD8J2zsJ/c7FdbZ6tcd+P0d2AlgK0VvwmX62PfprHXDnSP+WjXWdw yPUKwK5jedCpFJQpzSiyTokq0KLzeSR2REu8GysAD0V8muPB28R1Gu3kQ2bpWn6UnX/U qYXMiokVzkVRDvkyGYS9Hzjfq6VUKmWCpcSq2BWqbiZTx0YPU+bEHzAVA3htOj1ESM7Y be0A== 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=hEwLxmZ1/l0uu9kShjHwMMLEdP39KievYwY8GQL60m8=; b=SRlmENU04LaSZ1yqHJ1n+vaVUVndRKxsDKIoIYMkGf0ftIVmZkF9/90f0e3aAm1quJ fdIyNXZy87Sllai5K7fSx2Fek6oZnZPJVHqMIwm+RJE3NVM2I88R8Ymh9Qk7HjjQiF7U UMmWr+zX9GE8WfU3OZHpTjnD32pG8tzp4tMUVhi75SkT1FqNpPYr7FH53sPIbe8/TTJz HyzTAVnl7S9CmOJbXwKnyxV6vsKerd69uq5ZPm/WvnmI7aejaeCmRf/Lcl0EzB0ZehnS BgzpdkLPXSQp5QShBVL7vfygwVjjW+c3UOXAa3bYVXem+ECGJrC0k8WBj8HuPW7vxfod 1ZVA== X-Gm-Message-State: APjAAAXZOnaJb9F+kMHHUKfwcu6XkNWRhFwxRM/Fv9mmulrkZrP1FSV+ p1M8+qW7o0gxdhkc8HpPa99dZA== X-Google-Smtp-Source: APXvYqyGDyAqXw7f4po4i0YTi9aiFNTfgTgrAXfSBqqxlSHjJxepqV+o6E5Sk3VIH//1/ttNn9FUDw== X-Received: by 2002:adf:f186:: with SMTP id h6mr46801558wro.274.1567596074252; Wed, 04 Sep 2019 04:21:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q25sm3344955wmq.27.2019.09.04.04.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 04:21:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 813951FF92; Wed, 4 Sep 2019 12:21:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 12:21:08 +0100 Message-Id: <20190904112108.2341-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904112108.2341-1-alex.bennee@linaro.org> References: <20190904112108.2341-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::42e Subject: [Qemu-devel] [PATCH v2 5/5] atomic_template: fix indentation in GEN_ATOMIC_HELPER 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 , "Emilio G. Cota" , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- accel/tcg/atomic_template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index df9c8388178..287433d809b 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -149,7 +149,7 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, target_ulong addr, #define GEN_ATOMIC_HELPER(X) \ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, target_ulong addr, \ - ABI_TYPE val EXTRA_ARGS) \ + ABI_TYPE val EXTRA_ARGS) \ { \ ATOMIC_MMU_DECLS; \ DATA_TYPE *haddr = ATOMIC_MMU_LOOKUP; \