diff options
| author | hpa <hpa> | 2004-12-17 10:03:47 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2004-12-17 10:03:47 +0000 |
| commit | 3f4d6d81eea34770ddb50cfbf589d4d7febf1802 (patch) | |
| tree | 823f696aa4f872b63f1ac82f653eab00e5c09a2d /dos | |
| parent | 89d4a08e6df3062b3aaf302c3f41e54150aaced0 (diff) | |
| download | syslinux-3f4d6d81eea34770ddb50cfbf589d4d7febf1802.tar.gz | |
Fix memcpy/memset to match the use of regparm and .code16gcc
Diffstat (limited to 'dos')
| -rw-r--r-- | dos/memcpy.S | 16 | ||||
| -rw-r--r-- | dos/memset.S | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/dos/memcpy.S b/dos/memcpy.S index f6d4fd2f..d1e65c21 100644 --- a/dos/memcpy.S +++ b/dos/memcpy.S @@ -6,19 +6,19 @@ # .text - .code16 + .code16gcc .globl memcpy .type memcpy, @function memcpy: cld - pushl %edi - pushl %esi - movw 12(%esp),%di - movw 16(%esp),%si - movw 20(%esp),%cx + pushw %di + pushw %si + movw %ax,%di + movw %dx,%si + # The third argument is already in cx rep ; movsb - popl %esi - popl %edi + popw %si + popw %di ret .size memcpy,.-memcpy diff --git a/dos/memset.S b/dos/memset.S index a7f610a3..dd534e7b 100644 --- a/dos/memset.S +++ b/dos/memset.S @@ -6,17 +6,17 @@ # .text - .code16 + .code16gcc .globl memset .type memset, @function memset: cld - pushl %edi - movw 8(%esp),%di - movb 12(%esp),%al - movw 16(%esp),%cx + pushw %di + movw %ax,%di + movb %dl,%al + # The third argument is already in %cx rep ; stosb - popl %edi - ret + popw %di + retl .size memset,.-memset |