Message ID | 20210228232321.322053-4-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp2914310jap; Sun, 28 Feb 2021 15:29:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxPn7oP7IxpmljjDmUgazLCvaoa5xojPUo5NJsDzLGF8kB4s5aoDf3Fl1QVoedevy6zBxh X-Received: by 2002:a6b:b447:: with SMTP id d68mr11164069iof.87.1614554973457; Sun, 28 Feb 2021 15:29:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614554973; cv=none; d=google.com; s=arc-20160816; b=suS28VYldWDD3TABATb3jyAYBN0VCYwJayQrfd28mOn6xo/Zu4vxv2uhe3+AUYZvb2 enKpvjhePo6AvXT425E7KkhHUh3+VjEDQ7AVLusX5T2myoiPVigZCtrn/as9rLlEVZQu mnS3l/cNPJJnJ7rSnOKrxMcG1w/dRRBDiyX/BuNIf7cJ28UUhynA2jVs1h0ZMxVc4nQ1 2iIwPN2ahgn0oGaAz7rqklbkA6X8d901qiva+NtGQ0KF2E8/IQ82I7NXElD7YH9SI1c3 ANZyCuDOXEVVArrR3qI+UuY+3hf/bx94PPCYAFk1zJckp+AeSEiVCKkxa+qnkA/SItyV XQxw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SbL2dW1QfQ+CyQTDJgcTi/qLjMFE5Hm5ssvxBaiakag=; b=Z7Z+MMELjxlzQzCqsivksAlTI17caIHV616kliKSGxj/JO7IqKJ2zlTuGBovneWjNC JfT3GjJS8l6bNwF5hSVAKAgtzFC1MndmJNQmcyxrxPcugTGKTM2CZGqPaJa35QfNylDA /aUxvpjLL5lk87g6qj0ue5bodNZ8XaJ0IRzo/yHYISmeH2/WBSXgVKqeqhCiQaFR8SAy KvqLgDCClkWOj8FLwG104Hf/V8D7bs77z0yqnI0/PJGy5rfJ8AXMyRVCAISWr/nl1kzx Wd9nUPe7Jz5T9gFhlqJTtx440FQ9HRq3XtIYPRhxFuDooqfTbv40OitUs9QlBJfXW6hD L5Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vo7vwJnO; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p4si14517360iog.4.2021.02.28.15.29.33 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Feb 2021 15:29:33 -0800 (PST) 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=vo7vwJnO; 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]:42350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1lGVVE-0003zV-QR for patch@linaro.org; Sun, 28 Feb 2021 18:29:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1lGVPN-0005KD-0S for qemu-devel@nongnu.org; Sun, 28 Feb 2021 18:23:29 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:34756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1lGVPL-0007fD-AP for qemu-devel@nongnu.org; Sun, 28 Feb 2021 18:23:28 -0500 Received: by mail-pf1-x434.google.com with SMTP id m6so10282315pfk.1 for <qemu-devel@nongnu.org>; Sun, 28 Feb 2021 15:23:26 -0800 (PST) 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=SbL2dW1QfQ+CyQTDJgcTi/qLjMFE5Hm5ssvxBaiakag=; b=vo7vwJnOUBy3AXHollETtSZd5+/BQ42mggGxVn8fmG5zj0kCbooLCIMF+qKcPZ1x3N U1IOa+/2ON7stQY+I6LOcwSsI6QBCwQCQRvx/th7JnB5/KRYy42nrHyZumKjULMktzxM UdrgI88gpkqe2Tzgvg7U8D6+5ytIUkksLNLM1ZNn3OFbdVO3hEiXe4c1etufq2KNQfBF NpPzIRvSEGT6QgH8uz0oGV8FXvSQw+urxzIT9ZD2wQY6YZRLqlHuEyomTe+r/0/oyufw TtFgs/wdGGANqYBiYBkzxXCpinrRw6rc790hl+rJEkfeHJ/TjvJCz/QaoGHwsyMGbiPa upLg== 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=SbL2dW1QfQ+CyQTDJgcTi/qLjMFE5Hm5ssvxBaiakag=; b=KSXRn3UUEi4oDK4ogDxZl21u4AvPmzHbm0IENJeakIMG3hnKkjdCUV/aM5Dfdj9Ilu XZVIatU+ze9FB7rSE63PuhHbN8PiIrG8blBJxy/Dy7ctpIU0S0KMSX1ghNG8PWSfsZwu biUvZdGZ6kFbwCm9IWGuRC+hU8rRk8WAqNTA9PW80+ZNtmdqf1idWTPBT4tXlmaMjqxG W0gauoYrKPJoPTgm30IGfptxPbNpi7QeOb9QE1PUPTMolzmkcT5xgRKRTHIpMnObGWZ6 8KCx4eznM2BK8Q/x4eodOprRXTZqdgt0vRXlTE/l2YmSSvXFK7Ew0Om+tFoW6lrpT9+q PMdA== X-Gm-Message-State: AOAM530zsqLaEbELxEinw/y9OOqsp8W2hCI55e9EA120gf7OoMSi42SI GlICtUrUgySzcUc+Kkse+9gX1J0oVU1M8A== X-Received: by 2002:a63:36c4:: with SMTP id d187mr10068396pga.168.1614554605926; Sun, 28 Feb 2021 15:23:25 -0800 (PST) Received: from localhost.localdomain (174-21-84-25.tukw.qwest.net. [174.21.84.25]) by smtp.gmail.com with ESMTPSA id d24sm16257400pfn.54.2021.02.28.15.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 15:23:25 -0800 (PST) From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH 03/50] target/i386: Unify code paths for IRET Date: Sun, 28 Feb 2021 15:22:34 -0800 Message-Id: <20210228232321.322053-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228232321.322053-1-richard.henderson@linaro.org> References: <20210228232321.322053-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: cfontana@suse.de Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
i386 cleanup part 3
|
expand
|
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 5703b253a1..59c1212625 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -6571,22 +6571,18 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto do_lret; case 0xcf: /* iret */ gen_svm_check_intercept(s, pc_start, SVM_EXIT_IRET); - if (!s->pe) { - /* real mode */ - gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); - set_cc_op(s, CC_OP_EFLAGS); - } else if (s->vm86) { - if (s->iopl != 3) { + if (!s->pe || s->vm86) { + /* real mode or vm86 mode */ + if (s->vm86 && s->iopl != 3) { gen_exception_gpf(s); - } else { - gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); - set_cc_op(s, CC_OP_EFLAGS); + break; } + gen_helper_iret_real(cpu_env, tcg_const_i32(dflag - 1)); } else { gen_helper_iret_protected(cpu_env, tcg_const_i32(dflag - 1), tcg_const_i32(s->pc - s->cs_base)); - set_cc_op(s, CC_OP_EFLAGS); } + set_cc_op(s, CC_OP_EFLAGS); gen_eob(s); break; case 0xe8: /* call im */
In vm86 mode, we use the same helper as real-mode, but with an extra check for IOPL. All non-exceptional paths set EFLAGS. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/i386/tcg/translate.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) -- 2.25.1