From patchwork Tue Sep 14 00:14:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 510489 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1055024jao; Mon, 13 Sep 2021 17:40:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwePyENF460d2jq1gCbQ+mzzoepKggzBO07E94xsyvOyQtSWrQbR1OHkqKfA5eH5FmB017W X-Received: by 2002:a67:d007:: with SMTP id r7mr7361253vsi.23.1631580052905; Mon, 13 Sep 2021 17:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631580052; cv=none; d=google.com; s=arc-20160816; b=Lba9knXN1HdEh2kERIQxAhuXCeI7lRl37tlsYZPtSEqyGxyhR3YgqnFS38lCK7Ztjm f8BFZwoR1Wu7buozdT+ldG56ltjbTxKDUI4T72XgV4s3vGHseTyd0yXNM4s82EaDn2E8 RGvFuQ40IH0aX6gemFzafcJdoaggo/PSe2BB3KEyXsAIIpa4PKvClFJ6WkFmCOVTqEBg PGH2k/+AM/SL7eb4nu3oXE66BSLgrfDfX3msCv+HrRAVyYlAystX5nj7EEV01hzvJd7G 1Jiz0lZ63Hcb8rcdYjIBJlfum+DbfYxmoLeyokEHwDG49e6BhGr30E+xs3cMATD6smVO tK5g== 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=DOATSVlMI8v93icbZz2oPU0yhH1ot3hFTS6J+8BagtA=; b=xUQ0eNAc1QFsrrG2U3uvgxIRrWEenKjQVH0cDw9lJqEgWnhB1+yAAdoW0IICsCE6BG +X6TqHQmpw5aAPVRhTrms01MUBH233YrNRwnw6MBwJ2ZBajwoL166p+JAmNu2e9AjNGE ylsD8A3iI+58jM8XJ4a5sYgoPVn7nEe0BvWveWZKI/qDfk5Iac28HOAtP+O21VoPxWUy ZxgmVhoAJbz/ve55CIAjugj+ZqKsSzurOy7jXfMJJBmCjHPe4SELlY4+9NK+rFj3zKYk qzi8nuc/n3z6udZIgejrTNwlR1v0Rx9ntRy7FXuaK8stKLUlnaW7qcwmHSwZuMdSxo0R +aGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xbtkVz3a; 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 m124si1574581vkh.12.2021.09.13.17.40.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 17:40:52 -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=xbtkVz3a; 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]:44166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPwVI-0004Si-B3 for patch@linaro.org; Mon, 13 Sep 2021 20:40:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPw6S-0001k9-1s for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:12 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:39849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPw6N-0007ev-SU for qemu-devel@nongnu.org; Mon, 13 Sep 2021 20:15:10 -0400 Received: by mail-pg1-x531.google.com with SMTP id g184so11003558pgc.6 for ; Mon, 13 Sep 2021 17:15:07 -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=DOATSVlMI8v93icbZz2oPU0yhH1ot3hFTS6J+8BagtA=; b=xbtkVz3aj++4uZAJ3LjbqbNqpVBa+WrmedqMk3LeLwh4NwntYewCQ8HW1IVd5fo1iZ 02f8b/V7xWEHhxgiP5krFvFO+OP51X9+xJQc2EV5aF0nsWK6WjLGGaBMxd6lwTOO7nlj muPwRZne3Rv/f4NvN/sjSEdA3hnjxAQ0iV7jD8j5P75z1T6aVpO6sZn0iFzd+Fkn9RoN z0KmjDtQWAGR7a9URzOyUDgIskIuYqcu70wDKOHtwN395aaPef4y+8kGruYKErn3PfMq t63C9tCFNDQjB0BFzSmDdtTcTf+mLMRP7z+HRsm71ZWCfycm7DuG6Q4ukGk1EXe+dmR3 TcyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DOATSVlMI8v93icbZz2oPU0yhH1ot3hFTS6J+8BagtA=; b=GdS/r95OsxD1qurzGbMtmgkTVmgUTFLobXMFmuwV1Q8vZuDIvzxTUzy6ghuX/jvANv QsYTHKiMSW3Puvpa4usSW7vfN+gQpdrodXoxwy8IUZrWERAnrQRFqYCnAbjEFecKvTus LeBySySNhJwBuSUtzJLffxN3fho/5QH+vhtU2ga+u0QOYKv7r5K3lOuY3wQLAId/MIRG hESpKHwVaE+HnofN6huO4QmBylJoQLVa8lrL4sJe923CDrJ5vbAhKUOsdxhMI9Xrc5+T hqBDyJLDDhbj2fG7D/093IbSOferhhnq4qje+z1yr1f7CzeA4FgBNrvOE7Q2wNug0WOs Pwmw== X-Gm-Message-State: AOAM533NBbOwT4UAhLnc5mQ4Dt0hmX9R0qsWYh+05s6xYWjTCEoIjPRS 6nzh+VohiWdaYOfCuCwEOjKpsgl6Bcm0zw== X-Received: by 2002:a63:b40a:: with SMTP id s10mr13170156pgf.454.1631578506525; Mon, 13 Sep 2021 17:15:06 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m7sm9334179pgn.32.2021.09.13.17.15.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 17:15:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/44] target/i386: Simplify TARGET_X86_64 #ifdef'ry Date: Mon, 13 Sep 2021 17:14:23 -0700 Message-Id: <20210914001456.793490-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914001456.793490-1-richard.henderson@linaro.org> References: <20210914001456.793490-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Warner Losh Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Merge two TARGET_X86_64 consecutive blocks. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Message-Id: <20210911165434.531552-4-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/i386/tcg/seg_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.25.1 diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index cef68b610a..56263e358d 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -929,9 +929,7 @@ static void do_interrupt64(CPUX86State *env, int intno, int is_int, e2); env->eip = offset; } -#endif -#ifdef TARGET_X86_64 void helper_sysret(CPUX86State *env, int dflag) { int cpl, selector; @@ -984,7 +982,7 @@ void helper_sysret(CPUX86State *env, int dflag) DESC_W_MASK | DESC_A_MASK); } } -#endif +#endif /* TARGET_X86_64 */ /* real mode interrupt */ static void do_interrupt_real(CPUX86State *env, int intno, int is_int,