From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FE34C433F5 for ; Sat, 11 Sep 2021 16:56:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B7E6061153 for ; Sat, 11 Sep 2021 16:56:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B7E6061153 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:57726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mP6J2-0000H9-Tj for qemu-devel@archiver.kernel.org; Sat, 11 Sep 2021 12:56:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mP6HG-00069p-5y for qemu-devel@nongnu.org; Sat, 11 Sep 2021 12:54:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mP6HE-0002DD-Ql for qemu-devel@nongnu.org; Sat, 11 Sep 2021 12:54:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id u15so1435460wru.6 for ; Sat, 11 Sep 2021 09:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=B2cPwU6uBkt0E42CdgO+HC0TFDfX0nWohCtyQyAdOmLaWPvG85p0ybjK7XLniieQGw bF2iZ0ClIKdO9zFCtX/jgvOMGVCahRf2pwWdVVxedz3CwbZCE6aOkSX8u7xmu26dBHKp ZG+Ts4twYkoNsuBRk6Q91jZsnC/oNDHZr7VG+gGqy6CPhnaSBc7zqJYRwGt7WEMeFO8S RfL0JFRrBcmaUQzGy2av0UEODKf508xnbxOWhRPDwRW6nXogk2jgUWkiuLpH4TrdnPJ0 y41EH7SSbgf0tEnZuuiAAxGrFLNexoUpvihIIJ/nhoOecAhFVIetWBkhGWVJ8m+y2f8h vYKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=7qHUwHHlF7VQ9hVO0pRJdiW2h2pBs3yrd5aENAbFK2BGKXASFUBA4BPGqAUVgx924X gWmGh3UAjYF6gfYNSpIbLYWyXb1idAetsUZEHS1qDUaTaGUOhRfHQ5IbFJNo/VsVNKjb uPOASs/Kkt0Ws7Vf6C0wGRY/Yg41RJMHln1jIpNCdOcGGgdPpTHRCkZU5wJf5HGhpoDi 3pgYQuWF0h+/deG515kB0Y7wiBXazztxZvOnzceAiHx6tsydhtFLO2vHYgM8M4u48v0x 1rd6y24joKFluy6FCDNcigrzTA3c1GT/XeAzBI0MmIZDOGN8t68BmUvhHQqIF1XH154P oBtg== X-Gm-Message-State: AOAM533BXKaJxcA81YRVcMazfppiB894luGI+aOVIW1O4UgqFH3w2GRB 742PR/rLruUblIKDFcOIBmSbM0CNzLE= X-Google-Smtp-Source: ABdhPJxT6i3ughafuEm8UkGbUNSWX88JY7+BJ9t4NGFnaML1XNt/KB3Wx91gTBGLZY+swQ6kz9VAvA== X-Received: by 2002:adf:de8a:: with SMTP id w10mr3802445wrl.388.1631379291288; Sat, 11 Sep 2021 09:54:51 -0700 (PDT) Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id y18sm2174002wrq.6.2021.09.11.09.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/24] target/i386: Simplify TARGET_X86_64 #ifdef'ry Date: Sat, 11 Sep 2021 18:54:13 +0200 Message-Id: <20210911165434.531552-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Merge two TARGET_X86_64 consecutive blocks. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/i386/tcg/seg_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 3ed20ca31d7..dee7bef68c6 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, -- 2.31.1