From patchwork Sun Oct 16 22:23:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 615435 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1621118pvb; Sun, 16 Oct 2022 15:26:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7go9Sc9yUdkA3SKff9S5N+4nNggumozY73qfsu1Ueam6jucWChLWKBi5iz60KJ0fPxt44x X-Received: by 2002:a37:ad5:0:b0:6ee:c82c:5298 with SMTP id 204-20020a370ad5000000b006eec82c5298mr5661445qkk.185.1665959201843; Sun, 16 Oct 2022 15:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665959201; cv=none; d=google.com; s=arc-20160816; b=xwLXeIsRv8uouAoMUHFiJtzQq9r9DX7DBUHy+BSV2BJtiXpod/W5sakepVfiBso3ju //ZbUG4xrnqZIJZ5IeXz61qbyuk6PzJ7x/QV6I7PZK6omTiA/iAk8wJ5ITXldOeG56c2 rqzHLkkRkjEETykz/RZN3uDSEGfKAB9htyc86k7Z4g2XKMDdLEZ+S+ZyHqrZE8jd9mYu AM+yrCzjrzhA7AhmXcgWsh9hy0OAJzJgJu82B3T3msoBW89e4VqQE6giYOxDkYuZ5LdP z7Nt/YujQOsg7+F7Mfq1PfmFL9eDdAHjKo4faEC+2LiTWO6vL2wFX3u4dFccTWSdwLl+ Lgiw== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=GPEmDd48yJEOUJxwh+z52WM36oU/vXLILAexTJFvUyA=; b=GrOj0wpa7qGsAERzQKvTkvlNnmseIX0/IxULNQ+is5XcUxxjjr2ppngmMTSGesGPYF 2nQ3Gfv5Rb0KTBEAOgGMiAw5f12sWT8TqMb5wStk3/XTgI47qj8erUrTf9JhMUwx4SYa YIBBkoyvWsLaUakes0axMzJM0s/IjkCfhQKZ+sqvpMi2c9nUfh3K4plx734WhNMhc9Rq 9M5xWP5Nm+8jInwfPmYOu1soEnvZsfsmKB2nMJnV+gnc+nHpAyb7ON4g7CpRw5c9KDOg saUrZ+YOtCAzqA4s2mJJI/8QjsB2SgCfr+TPpfzm7/nJA8xDueGjAjyDVlUlHWxjOx95 kk/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ymRjJyns; 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 y7-20020ac81287000000b0039739334df6si4526820qti.23.2022.10.16.15.26.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Oct 2022 15:26:41 -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=ymRjJyns; 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]:41272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okC5h-00062p-C9 for patch@linaro.org; Sun, 16 Oct 2022 18:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okC30-0005yZ-6j for qemu-devel@nongnu.org; Sun, 16 Oct 2022 18:23:54 -0400 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]:45869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okC2y-0000u3-H4 for qemu-devel@nongnu.org; Sun, 16 Oct 2022 18:23:53 -0400 Received: by mail-oi1-x232.google.com with SMTP id o64so10413652oib.12 for ; Sun, 16 Oct 2022 15:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=GPEmDd48yJEOUJxwh+z52WM36oU/vXLILAexTJFvUyA=; b=ymRjJynswDnFlY7rKUu9Q4DnXzLpIUZ3gQArlPjHHFcar0dPuamj4b8+4vYjUZctcL IYj3pXD6fqkSgbAQulaQRn6lfoW7Bg1wY8qfj4RSmTVByNMjcpVPetTQsd9B4twfoKef Cak/UbUDh4OJf76c8IZSaIEy+X47gK67/63ZX8cJrJdXlDOO0b3qU5A8rBZBs0rPH/tM nbJLDmGQ0cYsxfFbaF7n3Fu1i8ds/PPD2wzMZoo7ZgkU2lwQzznLUsTD/ZdlWwDhNXb1 MP97/LZtLZMA7Vpoe511JnyRL1mjDjCKXc6HLLFHEFbDKj8O34Cj8LfeLXhnBFLl32B/ +ecQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GPEmDd48yJEOUJxwh+z52WM36oU/vXLILAexTJFvUyA=; b=zZk84XB+FMw1cMX7pOHLP+vSHrrKtQbzS+uaEoZAtWKC+E+iacEsDh6pVDotsR07Y9 wfshrR67wbCkzVEXHdsOtma/OFGZXLBS0cb3+qd6jVeHbY9q67miYhQMIBoPHx2FYovz AJyhNVLQm851w6O2K5THPjdr/34EGQDxxQEu2Hlr8jOSYUzoU5VT4B0DdG0YxyMoK2lw TAW+XlctDuF1hIPy8VF9GsoSSkNvwLvnRa+Jkv/wPx4yaSh/NMCaWfLd4Zx8ETJlPGf9 1T0ye03meNqnPEbrNuWGO5C80CaaQBI/6Hhii6ZByosbNvL38Pd281wvnlAmFlnE/6Lk x/IA== X-Gm-Message-State: ACrzQf1AZLtT+GDNvbZbUtAluYZz8YxHLBezO1I8bsZMGoMMkaLZhwfb Aa4QbQ7xt80gUXFgE3A+5Qc6X+XGkgx/AH8u X-Received: by 2002:a17:90a:b903:b0:20d:a36b:6791 with SMTP id p3-20020a17090ab90300b0020da36b6791mr22549358pjr.26.1665959015943; Sun, 16 Oct 2022 15:23:35 -0700 (PDT) Received: from localhost.localdomain ([149.135.10.35]) by smtp.gmail.com with ESMTPSA id ik20-20020a170902ab1400b001730a1af0fbsm5213027plb.23.2022.10.16.15.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Oct 2022 15:23:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Maydell Subject: [PATCH] target/i386: Save and restore pc_save before tcg_remove_ops_after Date: Mon, 17 Oct 2022 08:23:03 +1000 Message-Id: <20221016222303.288551-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.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" Restore pc_save while undoing any state change that may have happened while decoding the instruction. Leave a TODO about removing all of that when the table-based decoder is complete. Cc: Paolo Bonzini Suggested-by: Peter Maydell Signed-off-by: Richard Henderson --- target/i386/tcg/translate.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 279a3ae999..75ca99084e 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -4817,6 +4817,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) int modrm, reg, rm, mod, op, opreg, val; bool orig_cc_op_dirty = s->cc_op_dirty; CCOp orig_cc_op = s->cc_op; + target_ulong orig_pc_save = s->pc_save; s->pc = s->base.pc_next; s->override = -1; @@ -4838,8 +4839,15 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) case 2: /* Restore state that may affect the next instruction. */ s->pc = s->base.pc_next; + /* + * TODO: These save/restore can be removed after the table-based + * decoder is complete; we will be decoding the insn completely + * before any code generation that might affect these variables. + */ s->cc_op_dirty = orig_cc_op_dirty; s->cc_op = orig_cc_op; + s->pc_save = orig_pc_save; + /* END TODO */ s->base.num_insns--; tcg_remove_ops_after(s->prev_insn_end); s->base.is_jmp = DISAS_TOO_MANY;