summaryrefslogtreecommitdiff
path: root/loadhigh.inc
diff options
context:
space:
mode:
authorhpa <hpa>2005-01-06 22:34:06 +0000
committerhpa <hpa>2005-01-06 22:34:06 +0000
commita966e54c41674cfb72340fd436bdf85988c14dd7 (patch)
tree93d244d27e6c2f9a6bca7b2432ba66c841be57fb /loadhigh.inc
parentfb7489b14bc413a373e4138157a34e2683a1aa26 (diff)
downloadsyslinux-a966e54c41674cfb72340fd436bdf85988c14dd7.tar.gz
Commit 3.10 changes to mainline. In particular, support multi-file
initrd, and the shuffle and boot API.
Diffstat (limited to 'loadhigh.inc')
-rw-r--r--loadhigh.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/loadhigh.inc b/loadhigh.inc
index 0bad64f0..0eef6858 100644
--- a/loadhigh.inc
+++ b/loadhigh.inc
@@ -27,11 +27,12 @@
; The xfer_buf_seg is used as a bounce buffer.
;
; The input address (EDI) should be dword aligned, and the final
-; dword written is padded with zeroes if necessary.
+; stretch is padded with zeroes if necessary.
;
; Inputs: SI = file handle/cluster pointer
; EDI = target address in high memory
; EAX = size of remaining file in bytes
+; DX = zero-padding mask (e.g. 0003h for pad to dword)
;
; Outputs: SI = file handle/cluster pointer
; EDI = first untouched address (not including padding)
@@ -70,7 +71,7 @@ load_high:
push ecx ; <B> Byte count this round
push edi ; <C> Target buffer
.fix_slop:
- test cl,3
+ test cx,dx
jz .noslop
; The last dword fractional - pad with zeroes
; Zero-padding is critical for multi-file initramfs.