From: hpa <hpa>
Date: Sat, 4 Jan 2003 05:56:02 +0000 (+0000)
Subject: Paranoia cleanups
X-Git-Tag: syslinux-3.11~632
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4d44a3247478159d1505f3d1a8c638cf92df457;p=platform%2Fupstream%2Fsyslinux.git

Paranoia cleanups
---

diff --git a/pxelinux.asm b/pxelinux.asm
index c51b764..d4153e7 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -288,7 +288,7 @@ _start1:
 		push gs
 
 		mov bp,sp
-		les bx,[bp+48]		; Initial !PXE structure pointer
+		les bx,[bp+48]		; ES:BX -> !PXE or PXENV+ structure
 
 		mov ax,cs
 		mov ds,ax
@@ -832,12 +832,12 @@ config_scan:
 ; AX contains the appropriate return code.
 ;
 local_boot:
-		call vgaclearmode
-		xor si,si
+		mov si,cs
 		mov ds,si			; Restore DI
 		mov ss,si
-		mov sp,StackBuf			; Reset the stack
+		mov esp,StackBuf		; Reset the stack
 		mov [LocalBootType],ax
+		call vgaclearmode
 		mov si,localboot_msg
 		call writestr
 		; Restore the environment we were called with
@@ -946,7 +946,7 @@ kaboom:
 memory_scan_for_pxe_struct:
 		push ds
 		pusha
-		xor ax,ax
+		mov ax,cs
 		mov ds,ax
 		mov si,trymempxe_msg
 		call writestr