[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 5/8] x86/boot: fold branches in video handling code
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Thu, 31 Mar 2022 11:49:24 +0200
- 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
- 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-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==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Thu, 31 Mar 2022 09:49:36 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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 <jbeulich@xxxxxxxx>
--- 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
|
