aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-11-21 16:14:04 -0800
committerH. Peter Anvin <hpa@zytor.com>2006-11-21 16:14:04 -0800
commit6a6ccb3746477ae339bd7e86f38d54d173ca3dc7 (patch)
tree859cde404998777a072eb19a29ae1fa58e3f768f
parent737d7f1f33cc21aa333330c9ca635eb4b1188700 (diff)
parent672e1a7b5133e49d29c924732419296a03ebe39c (diff)
downloadsyslinux-elf-syslinux-3.32-pre7.tar.gz
syslinux-elf-syslinux-3.32-pre7.tar.xz
syslinux-elf-syslinux-3.32-pre7.zip
Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux-3.3xsyslinux-3.32-pre7
-rw-r--r--memdisk/memdisk.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/memdisk/memdisk.asm b/memdisk/memdisk.asm
index 7be5e25c..09055d8f 100644
--- a/memdisk/memdisk.asm
+++ b/memdisk/memdisk.asm
@@ -646,9 +646,9 @@ bcopy:
TRACER 'r'
; We're in real mode, do it outselves
- pushfd
- push ds
- push es
+ pushfd ; <A>
+ push ds ; <B>
+ push es ; <C>
cli
cld
@@ -676,7 +676,7 @@ bcopy:
mov [0],ax
or dx,bx
- push dx ; Save A20 status
+ push dx ; <D> Save A20 status
jnz .skip_a20e
mov ax,2401h ; Enable A20
@@ -708,16 +708,16 @@ bcopy:
and al,~01h
mov cr0,eax
- pop es
- pop ds
+ pop dx ; <D> A20 status
+ pop es ; <C>
+ pop ds ; <B>
- pop dx ; A20 status
and dx,dx
jnz .skip_a20d
mov ax,2400h ; Disable A20
int 15h
.skip_a20d:
- popfd
+ popfd ; <A>
jmp .done
.protmode: