summaryrefslogtreecommitdiff
path: root/comboot.inc
diff options
context:
space:
mode:
authorhpa <hpa>2003-05-20 00:56:41 +0000
committerhpa <hpa>2003-05-20 00:56:41 +0000
commit2b32fdf7846a8b80366320ea03f438761734d49f (patch)
tree8400534804800d4ba7162e55d641d77e4a89c7ab /comboot.inc
parent05b031712688ef9cb724784ec246fa54813c0f7c (diff)
downloadsyslinux-2b32fdf7846a8b80366320ea03f438761734d49f.tar.gz
Formatting changes; comboot bug fix(?)syslinux-2.05-pre1
Diffstat (limited to 'comboot.inc')
-rw-r--r--comboot.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/comboot.inc b/comboot.inc
index d358147d..2e768ea4 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -98,6 +98,11 @@ is_comboot_image:
shl ax,6 ; Kilobytes -> paragraphs
mov word [es:02h],ax
+%ifndef DEPEND
+%if real_mode_seg != comboot_seg
+%error "This code assumes real_mode_seg == comboot_seg"
+%endif
+%endif
; Copy the command line from high memory
mov cx,125 ; Max cmdline len (minus space and CR)
mov si,[CmdOptPtr]
@@ -105,7 +110,7 @@ is_comboot_image:
mov al,' ' ; DOS command lines begin with a space
stosb
-comboot_cmd_cp: lodsb
+comboot_cmd_cp: es lodsb
and al,al
jz comboot_end_cmd
stosb