From fdfe1e9dadfa9e4b96f7c62e993f1e6548c2f293 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Tue, 10 Jun 2008 16:32:00 -0700
Subject: [PATCH] Fix DOS interrupt error messages

---
 core/comboot.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/comboot.inc b/core/comboot.inc
index abc7270..842b2f6 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -151,10 +151,11 @@ comboot_setup_api:
 		mov di,DOSErrTramp	; Error trampolines
 		mov cx,32
 		push cx
-		mov eax,0EB7A6A20h	; push 20h; jmp <tramp>
+		mov eax,02EB206Ah	; push 20h; jmp $+4
 .loop1:		stosd
-		add eax,1-(4 << 16)
+		inc ah
 		loop .loop1
+		dec di
 		mov byte [di-1],0E9h
 		mov ax,comboot_bogus-2
 		sub ax,di
@@ -220,8 +221,8 @@ comboot_bad_int21:
 ; Attempted to execute invalid DOS system call
 ; The interrupt number is on the stack.
 comboot_bogus:	cli			; Don't trust anyone
-		pop edi			; CS:IP
 		pop dx			; Interrupt number
+		pop edi			; CS:IP
 		mov cx,err_notdos
 		push comboot_bogus_tail
 		jmp comboot_exit_msg
-- 
2.7.4