[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/7] x86/boot: fold branches in video handling code
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Mon, 6 Dec 2021 15:19:31 +0100
- 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=nRRek+Dt6p8yYmmrup+jN+UOE4ERZjbBj6CGTydgQ26XDsUNNAJdySomfaGZZjpgd1zUp/uM2Xd2HnYhCQ8/OZ+5dzsq31zj01VF8IZRvCMA34/ghibVGCA2m00t+6mBye6Km3blJV+gIrvRyhFpvmmBDZaCfyXSp3KzYSYO26R1m+tq8ncJoWXuLIL5Yde1JmtgyyBxqP+R1vulBm4an+KXJXpJi3k+XduyQ+30d/649oPdmfMZ1JsWNgnKUo/aae6X1MSbMGzTnRW6yvaqJ572ZuXomDQY1v0aQqDxuYCyTpj4qfsIL/4YQReCzahgFH6loWbmAsli6tG5vy/ulQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F1mqj9o9WuS1AMchop50knu52etmeAqFRsUCqrvJqnFuLEIpDyccFvSzv1PqGLoF06CpiMxoooo769691scWOs5I+lmNgsI9/M9r/r+2y3cSmnV0uoZ3qTXTiBrfnCgg1oPuZLC4BBlfsOrPqtX9HBHkbE7YAic+EaOJDOCYPfrb0B3xoAVth5XTQlkXuwJi5UAMzdFPyEBUK5jdvItwjf1Yoft31SGmhI6KgSvpM+BwXs5INp6QVAWH8x9o3BYL70FhBW8YqxO1XUooIY5CBiI1BGjvM0M8Qbwi2fIbQ5QjbuHzfvi8Rs+KntThd4mndjKHfCJUAvZ9t/ConMZPqA==
- 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: Mon, 06 Dec 2021 14:19:37 +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
|
