From patchwork Thu Mar 31 09:49:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12796960 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 1FED3C433F5 for ; Thu, 31 Mar 2022 09:49:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.296854.505449 (Exim 4.92) (envelope-from ) id 1nZrQq-0006Xp-Qr; Thu, 31 Mar 2022 09:49:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 296854.505449; Thu, 31 Mar 2022 09:49:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nZrQq-0006Xi-Nu; Thu, 31 Mar 2022 09:49:32 +0000 Received: by outflank-mailman (input) for mailman id 296854; Thu, 31 Mar 2022 09:49:31 +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 1nZrQp-00061A-5O for xen-devel@lists.xenproject.org; Thu, 31 Mar 2022 09:49:31 +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 dc672d3a-b0d7-11ec-8fbc-03012f2f19d4; Thu, 31 Mar 2022 11:49:30 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2112.outbound.protection.outlook.com [104.47.18.112]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-9cWyOcaZPTeJwQBJ-cg6Jw-1; Thu, 31 Mar 2022 11:49:27 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by VI1PR04MB3264.eurprd04.prod.outlook.com (2603:10a6:802:11::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.16; Thu, 31 Mar 2022 09:49:26 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::914d:e08d:7798:8476%7]) with mapi id 15.20.5123.021; Thu, 31 Mar 2022 09:49:26 +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: dc672d3a-b0d7-11ec-8fbc-03012f2f19d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648720170; 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=aoBnjt6+glCRqKYvhWRwLixJ4A9ZW7DQtJeH7/BPfeZhmwrvJ8M1bRFRctzJHFI+iiEdY3 cSkryCGRxDc74iY0W/F1sQGrKQ9HJ/VJJLNWdbaEtU0N4VVBa5L12BgcQqxC7gSUEUAHDB Dywbaou16EJHj8ZVBcRNP+wWUQnDXDE= X-MC-Unique: 9cWyOcaZPTeJwQBJ-cg6Jw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q6HKUaI6hAPF/qfzmEeIG6ashHBUg+9ou4depZltvtzFff8xmu7AOs0dAW8+LNrsKJyYIt/hr0ZX4Karux+QwICWEPbNqBM53krR96bLxz2oM7UazJ+TxcQ4eKV0EI+A2vxVwODXYN/aM3EiE+iuNidAjCtuKQBhsdRh3/OGLDneFksRgyS2ndHY63zQli4RVed6j9m4Rqnj+ZnMm+14aOkLQo8as6xsa57AiFmlwEtqYGKOGCCE2NzYzomWBpTuM+AXR/ELNIsd3iJyXyBjBXXJwakF91KXWETcRJF+5s7peCvwqOf9S0eWqRdWHe9mV5SKzGldeJSF8EU7vEW0cQ== 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=PUNrxXtszns2zAt4EE89WeOv0ElhZIAfxDPx8qimtm9ciqTOsE9qlV/XI/EK3xA27v6aQ6FWiFOM+bJ+P27npkBc5BcQYcrwRSNtUE1HCZAcTC/SE+HkfDwyEgroHJY2CXCGsPZV4xYaCNqUfFjll0K1LAQWpju9pfHkMtgLpXvilnmpvrgN2ZSGciT0lVmShCTXHnVhAwniVUw2HiTKMf79Y/S31xx5Fi8iFpIr2eBLB3deWDY6Mekfe4AEkZh9LTtSMJwSwIHnhr7uNZLAh7VRW1wflZT80bBp04Y51a82k8+cr8gxFTExyAeTw/AluS9vXVyAVsEXoPNsvCNHVg== 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: <5e4ee27b-4904-b2bc-1650-df148b47387f@suse.com> Date: Thu, 31 Mar 2022 11:49:24 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH v4 5/8] 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: <819eb552-d49d-e98a-9524-8d30c1b93908@suse.com> In-Reply-To: <819eb552-d49d-e98a-9524-8d30c1b93908@suse.com> X-ClientProxiedBy: AS9PR04CA0065.eurprd04.prod.outlook.com (2603:10a6:20b:48b::21) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8ca1b11-0074-4c80-8d31-08da12fbbe17 X-MS-TrafficTypeDiagnostic: VI1PR04MB3264:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N0vAaVsYAgOpWwNgby88QHYSw08UBgReEVbBDMQwPp+5w5tj8020q1xSbOo0SjmDAfJDTig8OPZClLtwNNnuXBlVb15dWF5dhfC+1eK8yPaZsX+1fuWsxo16pLx+yqVJQ+5Mc/6wcNWojbWC6tJ8p/Zm5Ur9f8+WAsv58So1USCTP9ExQaoUftuJqR6ddF92nguBipfhGBFP4PrQM2LBrXsfkdllSHVgVD695xC7bshTCXoojqp33kbz7+Lgpd8pUt5UMTgZOqCFU3HiLr9d/CkGucjBi/pjszM//pHXf7Hv05gNmRTy8mYfuxvn39KbGBNW5ytLle0F6ot1lv6FaM5tNaHP44BRE8GqbmuyVvoAWI2mv2cD+XW1mCIwB7JPlUFkyXgrtu7G92T3pyMllE7IBFwpuUiB2g81yUhe8F9wrcAMwNVqML0rHvnY9SXasDvfulH5z5UxsjxWhyEdqAfrQKfZmcp/GpjYVnODqmT2S3Tj5GjvExzI3X4Vxhc44IH8BBndvyuY2ZyKClCKjc2+Yg8JzAElnO3Hk8BE5dS7u++7sYGiuFg78E6FDCwTNtJ0zO76kJ9GCUhwLOTah0FM/R6/Jk0Oj8sHi2bqrtewFNexl4I7rmhUUr6QOahIdDYXYJkM6bbeT/WtPN+hq1FUtMGqBVCGlAIllT+sAvSCw/MDL8AXDHU3yooL2AKIO3O9iyHeJhjL/ID+uQbSu5AFXR+I1NqqxT8MJz2o637mDJ8VegxCtuqvtmLY4qQ5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(31696002)(54906003)(6506007)(2906002)(86362001)(4326008)(8676002)(66476007)(66556008)(66946007)(508600001)(6512007)(6916009)(31686004)(36756003)(316002)(6486002)(2616005)(38100700002)(186003)(26005)(4744005)(8936002)(5660300002)(83380400001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CCu65A6jbxC/nBX4J/H1byc2PDGW?= =?utf-8?q?niM+guRYpeOuuTcS4Fc32VL8mn3uGvXKIQ5/927ytQQeQod+XMKJc21phSfm/Tiu6?= =?utf-8?q?GBbpWhMoYkbjtPscIO7r2zwGM5z2BZ/XQLS6UDu1GPx07nJ4dI/wi7Ba8b+4p1x/M?= =?utf-8?q?yObdD79gtG0H9Cq7z1gbL4cBuhT+JZiYDSEJqeZwSFnu5LZmATwYm4BGvlI3vBs0r?= =?utf-8?q?Cz3d/h3AS9xB7+LJGFIrcDgN/v5tVPJUhYwSFKBzAg6QpkDdiI+YVzwj2oKjd+BfM?= =?utf-8?q?qtaJPnWQb4K55bmlU+RfAYkDTxRCpffByOUuNkiN/RULk2eNpsttj1tX54VtBQEX9?= =?utf-8?q?Gd8SyPVEZDLUip7axqueABjci0WYnA9egt/6Msbxh8D8lfR1KtIhLywSCqB+RE1IR?= =?utf-8?q?5XTdexPfXm9xIkhYaJiwk2bg/Z4GpnhCK3M1emrDmd19nNFkYOUIkomEWKpRMXxfW?= =?utf-8?q?+jzTOJtLwwYjkZ2kturLcjn2ylOI86b4i79RF9iXCHIywqQlB023F0ZUvg3g3I7An?= =?utf-8?q?dYzK4f4KcxAYb07SwS7VydOff54GhBxwKkii57NcSrtMShYSCTxi/82XpIfXdjsal?= =?utf-8?q?QvaLUu3+72n7mj/039g3bSjeL3DuqepgY/Vp6P5F3cDyY2He5vo87jJqI7Bt+91yE?= =?utf-8?q?vdDYPEkQF89cByTBLRWEyr6OxWPW6ktFfB6+hqUkeS/Ut4Cm5nVtXyNqTeFH57cBP?= =?utf-8?q?agfJi7XlbAnUhn2vHqZ31O1XGJ9UDSOdK5VMrcA57lE8Fqk8TXXFYw0gg7kB79kho?= =?utf-8?q?lC5QuR/WDH3esjC2Fz6Sd7zD0mRnRKviSFlLCBSrY5RvHnG08tye+9ueo85aMWBVn?= =?utf-8?q?HsPsQJDRJOJErZs64QbJSkLY+zzyYzZogSloRed5ALuM9ZfupNCBbRugTLL21LMOo?= =?utf-8?q?ih94ahG7bpZIHpjccCFPUw4oskSHRL+aOXwPUZrCVJvyjn5MZ15ysJs7ZgnusjIg5?= =?utf-8?q?zE/wUjGNqZPWihotKxt+akwyUjR5JoVHvYheA5olcgO/obzzXNwueRGRhS+TiVkBK?= =?utf-8?q?Az/XZyUEQf4yqR6dalbI4O3hDcBPxSKJ7CRHd2CIbYxzZOkxtJriqXZp1AUUDMkNj?= =?utf-8?q?tYY/xZ2YHBmfz7FFxuRtNH+/EL6efTQS4ss25KN/WBcRWGg+x2JoQ1KAi1Wj6+0FT?= =?utf-8?q?BnGwQU6X8vbapt/tajZkX+sdf/q/dh9jL3MMLHycGKBYyKKNC/7W3mb97oZR1W9Df?= =?utf-8?q?YKP+DrQxZrW18TBiQb9Q+9GGX6qF3fxTyONKbJ2tkt2R5pYS3rZ5JUsfMsWg8f4bY?= =?utf-8?q?CGooUEcJCYDISmWdmUro9yxVTIfZZkis1SNII2QIrLu/PbLtks8zAv35HTgQ1137W?= =?utf-8?q?deD7PfJEKIaJIve3Hqz7L38Lui/VbABnAre752ozg/9em8dRK14UxF/P9UodTiyv4?= =?utf-8?q?88sfbcKb211kF3l0dc7iFl1HjzcnqskJXUdmLaomc0gQaK0tq4v7p5F+6l//8b6kE?= =?utf-8?q?9EWN3ff7Yrv4Z9yNEDGZ23VwR+4/F5DlNxz64TIbW0FVOV4rmZb2UXI4rpuFPRT8T?= =?utf-8?q?H48NokkZvKm89veJcW5BFOIqhKhaVwY14Pl4Yy+aiXUyD/BirARJWJL/AbzhgV34I?= =?utf-8?q?tvHRmfkr9Wd60r5a9yGLVDSRB+w/w9UzK9d/GcDWma2L+Qte1QDU9Ds+GTApj0pAb?= =?utf-8?q?Vf9Jv2P/cE8TNp1lCzypnD7m6odzx+9g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8ca1b11-0074-4c80-8d31-08da12fbbe17 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 09:49:26.2902 (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: J32NOlCrpnEaeGoxte9mf0E6ec6EiQnGqhRDXfbVS8bDRSDNZR6DC7Fo+G9AHhGhQlg17xcaNQ24rVJmFHhLoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3264 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 Reviewed-by: Roger Pau Monné --- 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