From patchwork Mon Dec 6 14:19:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12658563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0BF5C433EF for ; Mon, 6 Dec 2021 14:19:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239071.414397 (Exim 4.92) (envelope-from ) id 1muEq8-0008Hl-PC; Mon, 06 Dec 2021 14:19:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239071.414397; Mon, 06 Dec 2021 14:19:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muEq8-0008Hc-Je; Mon, 06 Dec 2021 14:19:36 +0000 Received: by outflank-mailman (input) for mailman id 239071; Mon, 06 Dec 2021 14:19:36 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muEq7-0007zW-Uj for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 14:19:36 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 89b0cfbe-569f-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 15:19:35 +0100 (CET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2052.outbound.protection.outlook.com [104.47.14.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-lJdjzbS3MuOjJ_ka8juchA-1; Mon, 06 Dec 2021 15:19:34 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2333.eurprd04.prod.outlook.com (2603:10a6:800:28::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 14:19:33 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 14:19:33 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:20b:312::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Mon, 6 Dec 2021 14:19:32 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 89b0cfbe-569f-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1638800375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GFSJGrEWRuZxL/lqFamJoez8zlHu39Sdg/lvj6ulEMc=; b=RZense3Ddp5Q+ToGfwvz7aET70HX/Px2n6dQ7chC0gYTOOM9iptNY4PNwC2XAy9/eT7DMZ p+3++ZK3TKjd4aTBmOl/bGTsBaeD42DcummmlgbSmjPaidIOgolpYfFBnwam4gEj+IdwgK VYCHbdCT0tAExxoAODnYTfZCKOlqFdg= X-MC-Unique: lJdjzbS3MuOjJ_ka8juchA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F1mqj9o9WuS1AMchop50knu52etmeAqFRsUCqrvJqnFuLEIpDyccFvSzv1PqGLoF06CpiMxoooo769691scWOs5I+lmNgsI9/M9r/r+2y3cSmnV0uoZ3qTXTiBrfnCgg1oPuZLC4BBlfsOrPqtX9HBHkbE7YAic+EaOJDOCYPfrb0B3xoAVth5XTQlkXuwJi5UAMzdFPyEBUK5jdvItwjf1Yoft31SGmhI6KgSvpM+BwXs5INp6QVAWH8x9o3BYL70FhBW8YqxO1XUooIY5CBiI1BGjvM0M8Qbwi2fIbQ5QjbuHzfvi8Rs+KntThd4mndjKHfCJUAvZ9t/ConMZPqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GFSJGrEWRuZxL/lqFamJoez8zlHu39Sdg/lvj6ulEMc=; b=nRRek+Dt6p8yYmmrup+jN+UOE4ERZjbBj6CGTydgQ26XDsUNNAJdySomfaGZZjpgd1zUp/uM2Xd2HnYhCQ8/OZ+5dzsq31zj01VF8IZRvCMA34/ghibVGCA2m00t+6mBye6Km3blJV+gIrvRyhFpvmmBDZaCfyXSp3KzYSYO26R1m+tq8ncJoWXuLIL5Yde1JmtgyyBxqP+R1vulBm4an+KXJXpJi3k+XduyQ+30d/649oPdmfMZ1JsWNgnKUo/aae6X1MSbMGzTnRW6yvaqJ572ZuXomDQY1v0aQqDxuYCyTpj4qfsIL/4YQReCzahgFH6loWbmAsli6tG5vy/ulQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Mon, 6 Dec 2021 15:19:31 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH v3 5/7] x86/boot: fold branches in video handling code Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <4af7ce92-8f4b-0be2-2439-a1bfaff59be6@suse.com> In-Reply-To: <4af7ce92-8f4b-0be2-2439-a1bfaff59be6@suse.com> X-ClientProxiedBy: AS8PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:20b:312::35) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fd288551-6fe5-4ab8-23f7-08d9b8c36cc2 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2333:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6m8uUsnsvvzTt7yNTqDLYdmiMBqXzXA32E/myIxYj+kHtrlbg746IGTqtIvOA3ODm91oqPNDTVsn326aejeC+PCfZxxWVoF3n9wMnQU/r3rYDkJEqgvHdZ9LZkJS8OHW1Fc38XeV+yCC8iI6KAQz0658SfojTnUVxQrawdiUJ3WItBFAz7BjAB71sZ7CBpHOBAtqEg6Nf2+InnrQ5TYgGSUeufnhF6QwLuBYEU78CO1Mk7Q7jKbwPixcksdtAJUbl0Eg6VTxpWYnlcpvKi05FS94RzoCKR1wZLVcxN+3fY06aJ43g7ypaBDDaWs61SZ+D4bupZI9Fh+PAIUC2oKurGhBt+CMfOD4mwVf9Q3Fswcp53kYhKlSaadL4Ey1ccCUCxjy9250afp0lJoGvV/7UfGrxkd9H+QZPC4ErXKR1J9L9U5L5hCp3GqNyn7/bnUO1mGQmSVidfwhCgBsp+YJud+jZNpPtG3jL9Y/hDCXmdajmCwTUwJPlRGvDXJuVLE7WWLAOR8HV8yv6wewZIzgHg95HngcWYmcTUGMg1peYEjcRs8HIb5UhOrNqnRTStZav1QNkCo9wQ1cPa4uIdq/tgbZYndbBa5BCqkxrqyTXhDxJJTMPZntr6oX6FPCgXLxQc2PlawRCain/MNF/bmMLNCwa+7OPMf1Wwao1YrReJ6fojT9TraJDi/y9Z089/Uw6h2x126JXkvemrGZzlnqMWbUezz5meplkOOR+9qDwBw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(31686004)(54906003)(316002)(16576012)(86362001)(31696002)(66476007)(66556008)(4744005)(66946007)(5660300002)(2906002)(508600001)(8936002)(4326008)(8676002)(186003)(6486002)(2616005)(956004)(83380400001)(38100700002)(6916009)(26005)(36756003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?NBQzioF1pcJgYaxSh9GlO9udhOI6?= =?utf-8?q?oZ+2lyKpjUpLQyPDNqg8bnDPdJBKkFwCv+jgU+LLrNTio+21fn9ojCtfSWsNndX7f?= =?utf-8?q?Iu6uZcfZdUu8Hyo9IfzDUkmkLB7Ybhnbr23PsPT434DtCadRAZqj8ZliZOdzL/85Z?= =?utf-8?q?hfQ29S5ggokeh107kXMXmwgcZQ8GTeu6ZgPtq1xxZvxVWrBYoXlO9FqZ9YGBD6BXI?= =?utf-8?q?HF410wbiD/PPTjlUPd63yqTj9qxl7pAEvL6vDmSsHYtI5L+FTW0v3bLDZMrbhCjDN?= =?utf-8?q?/llkcMk7El5gAyLNeip59AhYvCU0ryWVI3ct2XIo8TvrvoaL3i7Xldoy5ZSJMED97?= =?utf-8?q?BxMWFjrKe0VaDBJivL/NEueOnB4D3/h2sldsK/4X7AVgglamxDAttJNfgQSo8CqVv?= =?utf-8?q?z67sA+12fKqWmwU5l53cNuG+QeQFhdR762SpTOHN7wtVMHVsgXWeFPHd6+2rTBwMI?= =?utf-8?q?8ufuKHb73slWy0qRvOJ3JAYxOl/dGKMrzjxWpm50ZKVxiOgJZE8x6kNWMzdVrikb1?= =?utf-8?q?M6fCJKo4yHOmsx7mk5LWpUvsOOX9u25rsWO/pDKxGH6DoBQRdqDVoBbVA04Qool78?= =?utf-8?q?eXEqRZRcuQ7LMKBk4UANLah6kb7u4KqJyAWByfx6/hquiCu/ZRQn65/Je/7GM7xcR?= =?utf-8?q?tgbZ9WP0h1FCGF7KTJVYIzAJWms81EgUne0p6zIE13Qf5qtVPpjAJkiDXoYcz5LhQ?= =?utf-8?q?7pJPds2yFvbJamWsJnaXSVRzIMWrduOc8Vd3yuM3umr49qVgnw+482XRwqeC7nl1S?= =?utf-8?q?0kYUZI/H0jsQKT54hsBRVinGpP2eIWg+ctX/CO6eLxjFK8g7JjNeoZIakxTlTS1kM?= =?utf-8?q?dO2+bLLUW4MYcKKwnkvvmhra3orCvmYchp4bTWQb8UUGcT+foK5NM+bZjxk4UIG+t?= =?utf-8?q?muELZJl3UZXazQbxbDQzT7MN4HrqXEfsrUP/AvgKpdjNsekaulldJhZNZMVnwn76C?= =?utf-8?q?rrNe2EQ5SE49YyFB9F0m0eXEGrwEW3YxhQgmK0QXVMcSPdeo3FbbIC6UtoriO4q/r?= =?utf-8?q?9e9lflw0RaP3AsP3gnEsG5RYxrWFazsSea0+aXwdkLfs6ngGIRfYZNSfuX27p0DuG?= =?utf-8?q?LHk+5EyHY91Pc1oneNOHQPJsM7FxcLDmBCS0X0yuvx95Nl+GWs7cl9Nzk9GxIobRD?= =?utf-8?q?x/0IUwVTRKmmoGa/6541Prj4ODolSWfBGz8sx3esqNIeX+zQEXECteZ3+bAQ94Sid?= =?utf-8?q?GkFiwNthlizgVAyOb/5amE8UmzWfcNUgPyPZCJG2Wwc5QVTB8TB4pMEAmopYakTO1?= =?utf-8?q?lfrIOw5ZtsK9IYOF60PnJsnQ8TaosHydN4uJ7ZOWIpYIp+Ts+58SsMrNyTAsx7ifQ?= =?utf-8?q?4uX6YIoxixsqFgOa2erakHsaBpBJGOPrT1izJIAdoyRJRxBIziZ1Sxclp+46KnR12?= =?utf-8?q?haiDJnwuSj0Yypqm4loC6t7VNe0Vpotz8GNVqSSkurfT76sHdETrXMzV3WfAgr0Zg?= =?utf-8?q?4l6FxqyceWyYZ2DYuD1pc5KfyFsPx9/YPqo6QKiQegQzqR5a8kZwvUEGPVTB2vznw?= =?utf-8?q?TJi5P3MTkLW8mDTMGOGz9WBFiRgOghLOPOZ4z74SO3PXDUDybc4hFHs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd288551-6fe5-4ab8-23f7-08d9b8c36cc2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 14:19:33.3811 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fajpi0vNe3WitnrpJTtJR6EXEiHW6k/fQjAM8r4EEHEtAIbZnSgiDKOSuEbuilnrmYXVR5W0XoLrDXuPgXfg4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2333 Using Jcc to branch around a JMP is necessary only in pre-386 code, where Jcc is limited to disp8. Use the opposite Jcc directly in two places. Since it's adjacent, also convert an ORB to TESTB. Signed-off-by: Jan Beulich --- a/xen/arch/x86/boot/video.S +++ b/xen/arch/x86/boot/video.S @@ -332,8 +332,7 @@ lment: movb $0, (%di) cmpw $0x656d, (%si) # 'me' jnz lmhx cmpw $0x756e, 2(%si) # 'nu' - jnz lmhx - jmp listm + jz listm lmhx: xorw %bx, %bx # Else => mode ID in hex lmhex: lodsb @@ -401,10 +400,8 @@ mode_set: cmpb $VIDEO_FIRST_VESA>>8, %ah jnc check_vesa - orb %ah, %ah - jnz setbad - - jmp setmenu + testb %ah, %ah + jz setmenu setbad: clc ret