In kaboom, use standard macro for resetting the stack where applicable
authorH. Peter Anvin <hpa@zytor.com>
Tue, 22 Aug 2006 00:28:43 +0000 (17:28 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 22 Aug 2006 00:28:43 +0000 (17:28 -0700)
isolinux.asm
pxelinux.asm

index acf7806..80fddc1 100644 (file)
@@ -755,13 +755,7 @@ xint13:            mov byte [RetryCount],retry_count
 ;        then do a hard reboot.
 ;
 kaboom:
-               lss sp,[cs:StackPtr]
-               mov ax,cs
-               mov ds,ax
-               mov es,ax
-               mov fs,ax
-               mov gs,ax
-               sti
+               RESET_STACK_AND SEGS AX
                mov si,err_bootfailed
                call cwritestr
                call getchar
index 5809a47..c49db37 100644 (file)
@@ -924,11 +924,7 @@ local_boot:
 ;        or a user keypress, then do a hard reboot.
 ;
 kaboom:
-               mov ax,cs
-               mov es,ax
-               mov ds,ax
-               lss esp,[BaseStack]
-               sti
+               RESET_STACK_AND_SEGS AX
 .patch:                mov si,bailmsg
                call writestr           ; Returns with AL = 0
 .drain:                call pollchar