summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-08-14 15:19:32 -0700
committerH. Peter Anvin <hpa@zytor.com>2007-08-14 15:19:32 -0700
commit9298132fc4d36498b5ee4ffb574e3b2cdc9d1358 (patch)
treec7881016e585d9b373c5a6a29859dbd07bd23bab
parent75c288770240e12ca46441387ae87eff22cbd9da (diff)
downloadsyslinux-9298132fc4d36498b5ee4ffb574e3b2cdc9d1358.tar.gz
com32: fix __farcall()
The address for the farcall thunk was inadvertently clobbered in entry.S.
-rw-r--r--com32/lib/sys/entry.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/com32/lib/sys/entry.S b/com32/lib/sys/entry.S
index 4df2f06d..be42c8b2 100644
--- a/com32/lib/sys/entry.S
+++ b/com32/lib/sys/entry.S
@@ -49,12 +49,13 @@ _start:
# Copy COM32 invocation parameters
leal 4(%esp),%esi # Argument list
movl $__com32,%edi
- movl $6,%ecx
+ movl $5,%ecx
movl %esp,-4(%edi) # Save the initial stack ptr
cmpl (%esi),%ecx
jbe 1f
movl (%esi),%ecx
-1: rep ; movsl
+1: inc %ecx # Copy the argument count, too
+ rep ; movsl
# Parse the command line (assumes REGPARM)
movl __com32+4,%edx # Command line