From patchwork Fri Jun 26 15:13:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191825 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp585262ilg; Fri, 26 Jun 2020 08:22:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUZ6Zp4xO5kGkwWTopxb3TrXxx3xG39mxblWfkg9/+LBRVQkpJPYU9W/47JhjDtvIWR9i8 X-Received: by 2002:a25:694d:: with SMTP id e74mr5962166ybc.195.1593184950674; Fri, 26 Jun 2020 08:22:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593184950; cv=none; d=google.com; s=arc-20160816; b=JdUu4NMYEybVO1CXQrkGeKOH+zG6zx2UPXsWD1k6iPQrR9h3NbOW+ZJOhVopWBUtCm VDfd6p5GldpGS+QLRoQsFSy7gPUeK2+/x4Oi8Mz6Z+0M8Tsrtx21W4RKw0+R3YIhjgIv rsX20CbVyqK3F4dt4MafvVp8seMo3bw9xSCc+gmMFD9Isd3AxZcWshgXnQPe2eWL9Xop I0yKnfAk0sTUVmM4WMCptWPyJSG+JmNcxVIxM3LrsnLi1MrF16/dY+Mwo3TCXTkiezQ1 RFYxwjq4WV3XA8Swk0594iE69y3fZBJBODA5WgN9YCURjLMJbIBSBC28+mMKUmhrUt1s eafA== 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:to:from :dkim-signature; bh=lxJLokSSwLrc0Y70TKAH3hjExPU/swMhK4k3zquMN7k=; b=IqUxaa78r+khLTcU2g56MNjpjcE8zdrycWPQnDTSYreUCBu8t1tjIDgBu48oEGt+It ODzSYrXwNEHR9UnWnJiAPKA2XIbp7T5NmzdcNxOhCyGY3U8smvXsZGka526zqADPXpHL qtMCb5P5h9JuH3VUfv0cGjIaqf2qLkDluIsu+Na8gNeuqTyidAqYrvrlbA+qfAGXPndS G6ghWQfHQn6iYnfqAEdTYN13joulqZ7g7AZo2GkmiZhSgMnzgbJkwafKgFpbSyX3a+wX kLRXOWJbFC5q4JOfMt+qyFj7I7XvT+nz78M65IG7Q4cTp/qV9LfIXO1RT+ITe4fQ/7bq Qd4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d52chu5v; 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 i12si26223212ybm.26.2020.06.26.08.22.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:22:30 -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=d52chu5v; 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]:45888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqBS-0006DF-5T for patch@linaro.org; Fri, 26 Jun 2020 11:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq43-0002GA-OH for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:51 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq40-0006Lk-09 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:51 -0400 Received: by mail-wm1-x344.google.com with SMTP id l17so9180738wmj.0 for ; Fri, 26 Jun 2020 08:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lxJLokSSwLrc0Y70TKAH3hjExPU/swMhK4k3zquMN7k=; b=d52chu5vPUyG1Z1B5gVU1A93r7nvg5fqXx74TyrFQBbdhBtbS3EIcP7GiuHAsHcljX dJ/q3XDo1oYmpFy5K+oiZoAKpJnivFd4IlpPRioapzsyZ2OZPYKewJMblQZw1NziH49P Oh1pv2ACIwyXYfYFEtQAj+wMhGt8Bshd/qLiEV9kUodH99APvFfkBWDz17WTebI5pVwv 8BaQ5dS4XI5/XjzmLvABIv0XvPzQyC9pvo9srEgsFc5gfxPKj1WliN8hqc1X1Z89tZXb ByQhmZZaH+ziidvQUqjRuGmWFcBoDeV6jWAJT/Fpxh0Sa9NGg8bs/G9Qp8IGj0Hiriij Ks4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lxJLokSSwLrc0Y70TKAH3hjExPU/swMhK4k3zquMN7k=; b=VLZe8F3SAIV97htvNEOKBjYTCflZ4N19HQFcpXxud0NwHgI21MNzs07c3uY3pt51bY BsxaZ72WaYjgTErVOkjiNWySodzOux407yDU5cN5xIPGcLIUDT7kBpDZW1AbibGBXFQs SPGifXiIsKtvtYy/YIcj2rI4EroRQejKOOZb4q1dzTLx9bQt/Gr9n4TzVsozEbrXVDBz ERCJdnuASpuO7fjabNM3LIvSn8eW4RwcJVegyMUM/sd7Fg+v+FhvahXZRJuniB2yqLqa OTB6ovzQ5gzqVjfoEfBCYm4uBzxQqMAFlwkbyh2AdjqnBA14NuFC6OKKDZ3w2ZlGni5U J3hw== X-Gm-Message-State: AOAM531IZGNvTI0tLtT/SxmMLXQbjBrVs1R9ZEYbX6cVcX6nigkef0e9 NxGqaNL/BuqU2A5xCz/r99Ygaxpp0M4hBw== X-Received: by 2002:a1c:b182:: with SMTP id a124mr3770187wmf.114.1593184486284; Fri, 26 Jun 2020 08:14:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.14.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:14:45 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/57] target/arm: Add DISAS_UPDATE_NOCHAIN Date: Fri, 26 Jun 2020 16:13:45 +0100 Message-Id: <20200626151424.30117-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Add an option that writes back the PC, like DISAS_UPDATE_EXIT, but does not exit back to the main loop. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-7-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate.h | 2 ++ target/arm/translate-a64.c | 3 +++ target/arm/translate.c | 4 ++++ 3 files changed, 9 insertions(+) -- 2.20.1 diff --git a/target/arm/translate.h b/target/arm/translate.h index d5edef2943f..6dfe24cedc0 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -173,6 +173,8 @@ static inline void disas_set_insn_syndrome(DisasContext *s, uint32_t syn) * return from cpu_tb_exec. */ #define DISAS_EXIT DISAS_TARGET_9 +/* CPU state was modified dynamically; no need to exit, but do not chain. */ +#define DISAS_UPDATE_NOCHAIN DISAS_TARGET_10 #ifdef TARGET_AARCH64 void a64_translate_init(void); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e4795ae100c..027be7d8c29 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14298,6 +14298,9 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) case DISAS_EXIT: tcg_gen_exit_tb(NULL, 0); break; + case DISAS_UPDATE_NOCHAIN: + gen_a64_set_pc_im(dc->base.pc_next); + /* fall through */ case DISAS_JUMP: tcg_gen_lookup_and_goto_ptr(); break; diff --git a/target/arm/translate.c b/target/arm/translate.c index 146ff5ddc24..c39a929b938 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -8874,6 +8874,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) case DISAS_NEXT: case DISAS_TOO_MANY: case DISAS_UPDATE_EXIT: + case DISAS_UPDATE_NOCHAIN: gen_set_pc_im(dc, dc->base.pc_next); /* fall through */ default: @@ -8897,6 +8898,9 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) case DISAS_TOO_MANY: gen_goto_tb(dc, 1, dc->base.pc_next); break; + case DISAS_UPDATE_NOCHAIN: + gen_set_pc_im(dc, dc->base.pc_next); + /* fall through */ case DISAS_JUMP: gen_goto_ptr(); break;