From patchwork Tue Oct 3 22:36:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 728829 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a4e:0:b0:31d:da82:a3b4 with SMTP id v14csp69362wrs; Tue, 3 Oct 2023 15:37:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMZ+CMarxFv39nefP1yaMx/H3U8hddut0KMok3zRVNh0kcDJ+fkl7cUTEnbIehtzrV+4qF X-Received: by 2002:a0c:ea29:0:b0:64f:430b:cab3 with SMTP id t9-20020a0cea29000000b0064f430bcab3mr732189qvp.9.1696372640593; Tue, 03 Oct 2023 15:37:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696372640; cv=none; d=google.com; s=arc-20160816; b=tuCzO1vLcmmcn0KHxhgb1bzXuu/DMVDcZ/2lxDV6jPyKzo0uiBR3Tejg8cLnn0E8Bb sZzoPlK/yjV8fHgYxqBSkvHgyRnJmvNcRvaU30vx9lXTTktmh3RjgMfW7ueRBCxcrSsq izGLiHHA80hQ4Ef/VBf+sqUAkex8U31zun/7FKvZAIhG4sQi/vAZuTg9ZSPTyua1PJc0 AWgMGcLoyCGIZk01JKQF8FGS3VH8PnmFL1iZKzAGsn9dN3ukojHOYeLBxPV9ZFuc76Ts moCJt940y57eR2ZCvEnoEHcFd4fVFMwdW+1e/oKyDEdjAru0LKfq0X+z3uIVz9hz/jhM NweA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Cgz9RF6i61ks8bpBg9LBISCk3BJSrpA+YPgHPb+5Mgg=; fh=5dVLAgKDoCfQ+t/uXKVoQGahHdcb4RhKMzZvDm/JpMQ=; b=j1q4/bavYohlIq9xGc96mbqinWxP4gyjr1Jmkpt8HOGMCgqrnYsWHUHObDbtXhTKUD IAL74WXkJTBklAW3kjXkiFzZCmX3dh3F9FCKC+B66fcZqLuhzilsHQxxBCcQyL8MWYqw ojhp23lTtBZ95FisNW2Eupj9rhyjLdRZNsTPEQQLRg8sn4X8siuOOVo1PecIdUkyvxup 43qn9aRJ6E2fzG3y5nu0/ABzYcyQ9tfhF/t7Sc2kGGRdlr82iJZvji3WkdS6lM6NogV4 IAXubnJt8bdAIYe0wy89ZGYeNmSA9QzZI8qKXJd4vynbLJegVrGhdbilVXrCjC6iwmki jvoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IxTUr4Zj; 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=pass (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 b18-20020a0cf052000000b0063d5ac48d16si918554qvl.433.2023.10.03.15.37.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2023 15:37: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=pass header.i=@linaro.org header.s=google header.b=IxTUr4Zj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qno0H-0000tC-Au; Tue, 03 Oct 2023 18:36:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qno0F-0000sW-Hu for qemu-devel@nongnu.org; Tue, 03 Oct 2023 18:36:31 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qno0D-0005Vv-8l for qemu-devel@nongnu.org; Tue, 03 Oct 2023 18:36:31 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-694ed84c981so1146638b3a.3 for ; Tue, 03 Oct 2023 15:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696372587; x=1696977387; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cgz9RF6i61ks8bpBg9LBISCk3BJSrpA+YPgHPb+5Mgg=; b=IxTUr4ZjafFREmu4yj8eZKyJptcy+bSRVJsRra2/Xz7ReX70dMKEJPpDlMMa/hJeb7 yxW+lPG+DLhli27Prf3ZopPR6CTLDeFQNpd61JhKBZ4oDuOSB+Ft7cPVAE9yvgwMR4dS oyRx/i8GStbMOU59imeVPwqm1da3b/SqcEetg5jSxLPTq4UCu8ynBixczxUMsFe9PTGf Io8J/f3xRC+gMCs+D1lptApWwtNLTKR32GFqqDnlhK+OODkXnrRVcvxLxYDadRR7E1j1 Jik10KByzZS+K4yfLc69Y5KOMdMKJYFi+zHQbwPKzC0aD95OsfQB0Oyr6fa5oeBER0Md oz0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696372587; x=1696977387; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cgz9RF6i61ks8bpBg9LBISCk3BJSrpA+YPgHPb+5Mgg=; b=fjmqZRGtx7yajC+2Qlp4oQj0o1RwtI/oUO5yEZujalW9IcaEs29hcJO8cyS5ht0kgY tdVyTSALOpJVtm71J/ZR+A8GU35KvnVY//TExQDxjR6dv13+VyWvAjyu0W34tRIOZGld H2Ltsnu0nNBKVc9jhZysXwcP6efblgDqjOd+RRbp2hJHCYtQWkYbrc7FWRBghHVxo3KZ 7nb2bc9yulBwmDpJQpiDbJHaQWtAxvRb/ZvCIto0rakyRG5zKXPwtmqCC/rJQYpfrMAr E/L1iBgK4/iMU9xE2v1BMxf6uRM//U7o412aWD+zoOnZR/lJwOjhGEp8LlUOYGPWrJER /WpQ== X-Gm-Message-State: AOJu0YyGVcrJnJABbXUG30G4BgiSD5flCjbCGRVBPugrlzdad6zM9Fi4 0WKbbjWUAIBVZef2OJ8DD5hhmA+8bhkQoKK8aJw= X-Received: by 2002:a05:6a20:8f26:b0:159:fe1d:2f32 with SMTP id b38-20020a056a208f2600b00159fe1d2f32mr917800pzk.42.1696372586780; Tue, 03 Oct 2023 15:36:26 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id q16-20020a170902dad000b001c75d7f2597sm2126055plx.141.2023.10.03.15.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 15:36:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: keithp@keithp.com, laurent@vivier.eu Subject: [PATCH v2 1/2] target/m68k: Perform the semihosting test during translate Date: Tue, 3 Oct 2023 15:36:23 -0700 Message-Id: <20231003223624.1753000-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003223624.1753000-1-richard.henderson@linaro.org> References: <20231003223624.1753000-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Replace EXCP_HALT_INSN by EXCP_SEMIHOSTING. Perform the pre- and post-insn tests during translate, leaving only the actual semihosting operation for the exception. Signed-off-by: Richard Henderson --- target/m68k/cpu.h | 2 +- target/m68k/op_helper.c | 14 ++----------- target/m68k/translate.c | 45 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 10697120f6..4549c28452 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -66,7 +66,7 @@ #define EXCP_MMU_ACCESS 58 /* MMU Access Level Violation Error */ #define EXCP_RTE 0x100 -#define EXCP_HALT_INSN 0x101 +#define EXCP_SEMIHOSTING 0x101 #define M68K_DTTR0 0 #define M68K_DTTR1 1 diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 1ce850bbc5..38eb85b8e7 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -202,18 +202,8 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw) /* Return from an exception. */ cf_rte(env); return; - case EXCP_HALT_INSN: - if (semihosting_enabled((env->sr & SR_S) == 0) - && (env->pc & 3) == 0 - && cpu_lduw_code(env, env->pc - 4) == 0x4e71 - && cpu_ldl_code(env, env->pc) == 0x4e7bf000) { - env->pc += 4; - do_m68k_semihosting(env, env->dregs[0]); - return; - } - cs->halted = 1; - cs->exception_index = EXCP_HLT; - cpu_loop_exit(cs); + case EXCP_SEMIHOSTING: + do_m68k_semihosting(env, env->dregs[0]); return; } } diff --git a/target/m68k/translate.c b/target/m68k/translate.c index ea7af25d50..e07b0b659d 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -26,12 +26,11 @@ #include "qemu/log.h" #include "qemu/qemu-print.h" #include "exec/translator.h" - #include "exec/helper-proto.h" #include "exec/helper-gen.h" - #include "exec/log.h" #include "fpu/softfloat.h" +#include "semihosting/semihost.h" #define HELPER_H "helper.h" #include "exec/helper-info.c.inc" @@ -1418,6 +1417,40 @@ static void gen_jmp_tb(DisasContext *s, int n, target_ulong dest, s->base.is_jmp = DISAS_NORETURN; } +#ifndef CONFIG_USER_ONLY +static bool semihosting_test(DisasContext *s) +{ + uint32_t test; + + if (!semihosting_enabled(IS_USER(s))) { + return false; + } + + /* + * "The semihosting instruction is immediately preceded by a + * nop aligned to a 4-byte boundary..." + * The preceding 2-byte (aligned) nop plus the 2-byte halt/bkpt + * means that we have advanced 4 bytes from the required nop. + */ + if (s->pc % 4 != 0) { + return false; + } + test = cpu_lduw_code(s->env, s->pc - 4); + if (test != 0x4e71) { + return false; + } + /* "... and followed by an invalid sentinel instruction movec %sp,0." */ + test = translator_ldl(s->env, &s->base, s->pc); + if (test != 0x4e7bf000) { + return false; + } + + /* Consume the sentinel. */ + s->pc += 4; + return true; +} +#endif /* !CONFIG_USER_ONLY */ + DISAS_INSN(scc) { DisasCompare c; @@ -4482,8 +4515,12 @@ DISAS_INSN(halt) gen_exception(s, s->base.pc_next, EXCP_PRIVILEGE); return; } - - gen_exception(s, s->pc, EXCP_HALT_INSN); + if (semihosting_test(s)) { + gen_exception(s, s->pc, EXCP_SEMIHOSTING); + return; + } + tcg_gen_movi_i32(cpu_halted, 1); + gen_exception(s, s->pc, EXCP_HLT); } DISAS_INSN(stop)