d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

plat/msdos386: refactor, firm up, and optimize

Browse source 
- refactor code for transfer buffer reads/writes, real mode
   int 0x21 calls, and assembler segment declarations
 - define transfer buffer size in one place
 - beef up error checking for transfer buffer operations
   (prevent buffer overflows)
 - also optimize such operations to transfer dword by dword
   where feasible
This commit is contained in:
tkchia 2022-08-26 17:20:56 +00:00
parent 8891fae303
commit cba54b205b
26 changed files with 292 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plat/msdos386/build-pkg.lua
View file

@ -9,6 +9,7 @@ ackfile {
ackfile { ackfile {
name = "stub", name = "stub",
srcs = { "./stub.s" }, srcs = { "./stub.s" },
deps = { "plat/msdos386/libsys+headers" },
vars = { plat = "msdos386" } vars = { plat = "msdos386" }
} }

7
plat/msdos386/libsys/_hol0.s
View file

@ -3,12 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .bss .sect .bss

12
plat/msdos386/libsys/brk.s
View file

@ -1,11 +1,9 @@
! Declare segments (the order is important). #
! $Source$
! $State$
! $Revision$
.sect .text #include "libsysasm.h"
.sect .rom
.sect .data
.sect .bss
.sect .text
.define _brk .define _brk
_brk: _brk:

31
plat/msdos386/libsys/build.lua
View file

@ -1,6 +1,13 @@
bundle {
name = "headers",
srcs = {
"./libsysasm.h"
}
}
acklibrary { acklibrary {
name = "lib", name = "lib",
srcs = { srcs = {
"./_hol0.s", "./_hol0.s",
"./brk.s", "./brk.s",
"./close.s", "./close.s",
@ -9,6 +16,9 @@ acklibrary {
"./isatty.s", "./isatty.s",
"./rename.s", "./rename.s",
"./sbrk.c", "./sbrk.c",
"./sys_cpyin.s",
"./sys_cpyout.s",
"./sys_dpmidos.s",
"./sys_exists.s", "./sys_exists.s",
"./sys_getdate.s", "./sys_getdate.s",
"./sys_gettime.s", "./sys_gettime.s",
@ -19,17 +29,16 @@ acklibrary {
"./sys_rawopen.s", "./sys_rawopen.s",
"./sys_rawread.s", "./sys_rawread.s",
"./sys_rawwrite.s", "./sys_rawwrite.s",
"./sys_scpyout.s",
"./sys_xret.s", "./sys_xret.s",
"./unlink.s", "./unlink.s",
"plat/msdos/libsys+srcs", "plat/msdos/libsys+srcs",
},
deps = {
"lang/cem/libcc.ansi/headers+headers",
"plat/msdos386/include+headers",
"plat/msdos/libsys+headers",
}, },
vars = { deps = {
plat = "msdos386" "plat/msdos/libsys+headers",
} "+headers"
},
vars = {
plat = "msdos386"
}
} }

9
plat/msdos386/libsys/close.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Close a file. ! Close a file.

7
plat/msdos386/libsys/errno.s
View file

@ -3,12 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
#define D(e) .define e; e #define D(e) .define e; e

9
plat/msdos386/libsys/getpid.s
View file

@ -15,14 +15,7 @@
! the new terms are clearly indicated on the first page of each file where ! the new terms are clearly indicated on the first page of each file where
! they apply. ! they apply.
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Get the current process identifier. For MS-DOS, use the Program Segment ! Get the current process identifier. For MS-DOS, use the Program Segment
! Prefix (PSP) segment as the PID, unless the system supports an actual ! Prefix (PSP) segment as the PID, unless the system supports an actual

9
plat/msdos386/libsys/isatty.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Say whether a given file descriptor number refers to a terminal. ! Say whether a given file descriptor number refers to a terminal.

24
plat/msdos386/libsys/libsysasm.h Normal file
View file

@ -0,0 +1,24 @@
/*
* © 2013 David Given
* © 2022 TK Chia
* This file is redistributable under the terms of the 3-clause BSD license.
* See the file 'Copying' in the root of the distribution for the full text.
*/
#ifndef LIBSYSASM_H
#define LIBSYSASM_H
! Declare segments (the order is important).
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Size of transfer buffer, for 32-bit DPMI mode.
TRANSFER_BUFFER_SIZE = 32 * 1024
#endif

58
plat/msdos386/libsys/rename.s
View file

@ -3,54 +3,40 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Rename a file. ! Rename a file.
.define _rename .define _rename
_rename: _rename:
mov ebx, esp
push esi
push edi push edi
! Source filename.
mov esi, 4(ebx)
movzx edi, (transfer_buffer_ptr)
mov es, (pmode_ds)
cld
1:
lodsb
stosb
testb al, al
jnz 1b
! Destination filename. ! Destination filename.
mov eax, edi mov eax, 4+8(esp)
mov esi, 8(ebx) #define DEST_NAME_OFFSET (TRANSFER_BUFFER_SIZE / 2)
1: mov edx, DEST_NAME_OFFSET
lodsb mov ecx, edx
stosb call .sys_sncpyout
testb al, al jc 9f
jnz 1b xchg edi, eax
! Source filename.
mov eax, 4+4(esp)
xor edx, edx
call .sys_sncpyout
jc 9f
xchg edx, eax
! Make the DOS call. ! Make the DOS call.
o16 mov dx, (transfer_buffer_ptr)
o16 mov di, ax
movb ah, 0x56 movb ah, 0x56
mov ebx, 0x210000 call .sys_dpmidos
callf (interrupt_ptr)
pop edi pop edi
pop esi
push ss
pop es
jmp .sys_zret jmp .sys_zret
9:
pop edi
jmp .sys_toolongret

32
plat/msdos386/libsys/sys_cpyin.s Normal file
View file

@ -0,0 +1,32 @@
#
! $Source$
! $State$
! $Revision$
#include "libsysasm.h"
! .sys_cpyin: copy ecx bytes from the transfer buffer to es:eax (= ds:eax).
! Preserve all registers, except the flags.
.extern .sys_cpyin
.sys_cpyin:
push eax
push ecx
push esi
push edi
movzx esi, (transfer_buffer_ptr)
xchg edi, eax
mov ds, (pmode_ds)
mov eax, ecx
shr ecx, 2
rep movs
andb al, 3
movb cl, al
rep movsb
mov eax, ss
mov ds, eax
pop edi
pop esi
pop ecx
pop eax
ret

34
plat/msdos386/libsys/sys_cpyout.s Normal file
View file

@ -0,0 +1,34 @@
#
! $Source$
! $State$
! $Revision$
#include "libsysasm.h"
! .sys_cpyout: copy ecx bytes starting from ds:eax to the transfer
! buffer. Return eax := offset of transfer buffer in the real mode data
! segment. Preserve all other registers, except the flags.
.extern .sys_cpyout
.sys_cpyout:
push ecx
push edx
push esi
push edi
xchg esi, eax
movzx edi, (transfer_buffer_ptr)
mov eax, edi
mov es, (pmode_ds)
mov edx, ecx
shr ecx, 2
rep movs
movb cl, dl
andb cl, 3
rep movsb
mov ecx, ss
mov es, ecx
pop edi
pop esi
pop edx
pop ecx
ret

16
plat/msdos386/libsys/sys_dpmidos.s Normal file
View file

@ -0,0 +1,16 @@
#
! $Source$
! $State$
! $Revision$
#include "libsysasm.h"
! .sys_dpmidos: simulate a call to real-mode int 0x21 with the current
! 16-bit register values.
.extern .sys_dpmidos
.sys_dpmidos:
movzx ebx, bx
or ebx, 0x210000
callf (interrupt_ptr)
ret

30
plat/msdos386/libsys/sys_exists.s
View file

@ -3,35 +3,19 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Say whether a file exists with the given name. ! Say whether a file exists with the given name.
.define __sys_exists .define __sys_exists
__sys_exists: __sys_exists:
push esi mov eax, 4(esp)
mov esi, 4+4(esp) call .sys_scpyout
movzx edi, (transfer_buffer_ptr) jc 9f
mov edx, edi xchg edx, eax
mov es, (pmode_ds)
cld
1:
lodsb
stosb
testb al, al
jnz 1b
mov eax, 0x4300 mov eax, 0x4300
mov ebx, 0x210000 call .sys_dpmidos
callf (interrupt_ptr) 9:
push ss
pop es
sbb eax, eax sbb eax, eax
inc eax inc eax
ret ret

9
plat/msdos386/libsys/sys_getdate.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Get the current system date from MS-DOS. ! Get the current system date from MS-DOS.

9
plat/msdos386/libsys/sys_gettime.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Get the current system time from MS-DOS. ! Get the current system time from MS-DOS.

9
plat/msdos386/libsys/sys_isopen.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Say whether a given file descriptor number refers to a valid open file ! Say whether a given file descriptor number refers to a valid open file
! descriptor. ! descriptor.

9
plat/msdos386/libsys/sys_isreadyr.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Say whether a file descriptor is ready for input, i.e. reading from the ! Say whether a file descriptor is ready for input, i.e. reading from the
! fd will immediately return something. ! fd will immediately return something.

37
plat/msdos386/libsys/sys_rawcreat.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Create or truncate a file. ! Create or truncate a file.
@ -18,30 +11,18 @@
__sys_rawcreat: __sys_rawcreat:
! Copy filename to transfer buffer. ! Copy filename to transfer buffer.
mov ebx, esp mov eax, 4(esp)
push esi call .sys_scpyout
push edi jc 9f
mov esi, 4(ebx)
movzx edi, (transfer_buffer_ptr)
mov es, (pmode_ds)
cld
1:
lodsb
stosb
testb al, al
jnz 1b
! Make the DOS call. ! Make the DOS call.
xchg edx, eax
movb ah, 0x3c movb ah, 0x3c
movzx edx, (transfer_buffer_ptr) movb al, 8(esp)
movb al, 8(ebx) call .sys_dpmidos
mov ebx, 0x210000
callf (interrupt_ptr)
pop edi
pop esi
push ss
pop es
jmp .sys_axret jmp .sys_axret
9:
jmp .sys_toolongret

9
plat/msdos386/libsys/sys_rawlseek.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Move the current file position for a file descriptor. ! Move the current file position for a file descriptor.

35
plat/msdos386/libsys/sys_rawopen.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Open an existing file. ! Open an existing file.
@ -18,30 +11,14 @@
__sys_rawopen: __sys_rawopen:
! Copy filename to transfer buffer. ! Copy filename to transfer buffer.
mov ebx, esp mov eax, 4(esp)
push esi call .sys_scpyout
push edi
mov esi, 4(ebx)
movzx edi, (transfer_buffer_ptr)
mov es, (pmode_ds)
cld
1:
lodsb
stosb
testb al, al
jnz 1b
! Make the DOS call. ! Make the DOS call.
xchg edx, eax
movb ah, 0x3d movb ah, 0x3d
o16 mov dx, (transfer_buffer_ptr) movb al, 8(esp)
movb al, 8(ebx) call .sys_dpmidos
mov ebx, 0x210000
callf (interrupt_ptr)
pop edi
pop esi
push ss
pop es
jmp .sys_axret jmp .sys_axret

66
plat/msdos386/libsys/sys_rawread.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Read bytes from a file descriptor. These routines do not do any ! Read bytes from a file descriptor. These routines do not do any
! translation between CRLF and LF line endings. ! translation between CRLF and LF line endings.
@ -20,15 +13,12 @@
.define __sys_rawread .define __sys_rawread
__sys_rawread: __sys_rawread:
enter 0, 0 file_handle = 1*4
push esi write_buffer = 2*4
push edi amount_to_read = 3*4
file_handle = 2*4
write_buffer = 3*4
amount_to_read = 4*4
mov eax, amount_to_read(ebp) mov eax, amount_to_read(esp)
mov ecx, 32*1024 mov ecx, TRANSFER_BUFFER_SIZE
cmp eax, ecx cmp eax, ecx
jge 2f jge 2f
mov ecx, eax mov ecx, eax
@ -38,41 +28,23 @@ amount_to_read = 4*4
movb ah, 0x3f movb ah, 0x3f
o16 mov dx, (transfer_buffer_ptr) o16 mov dx, (transfer_buffer_ptr)
movzx esi, dx o16 mov bx, file_handle(esp)
mov ebx, 0x210000 call .sys_dpmidos
o16 mov bx, file_handle(ebp) jc 3f
callf (interrupt_ptr)
jnc success
! Copy eax bytes out of the transfer buffer.
movzx ecx, ax
mov eax, write_buffer(esp)
call .sys_cpyin
xchg eax, ecx
ret
3:
! Process errors. ! Process errors.
push eax push eax
call __sys_seterrno call __sys_seterrno
pop ecx pop ecx
jmp exit
success:
! Copy eax bytes out of the transfer buffer.
movzx eax, ax
mov ecx, eax
jcxz exit
push eax
mov edi, write_buffer(ebp)
mov es, (pmode_ds)
cld
1:
eseg lodsb
movb (edi), al
inc edi
loop 1b
pop eax
exit:
pop edi
pop esi
push ss
pop es
leave
ret ret

44
plat/msdos386/libsys/sys_rawwrite.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Write bytes to/to a file descriptor. These routines do not do any ! Write bytes to/to a file descriptor. These routines do not do any
! translation between CRLF and LF line endings. ! translation between CRLF and LF line endings.
@ -20,15 +13,12 @@
.define __sys_rawwrite .define __sys_rawwrite
__sys_rawwrite: __sys_rawwrite:
enter 0, 0 file_handle = 1*4
push esi read_buffer = 2*4
push edi amount_to_write = 3*4
file_handle = 2*4
read_buffer = 3*4
amount_to_write = 4*4
mov eax, amount_to_write(ebp) mov eax, amount_to_write(esp)
mov ecx, 32*1024 ! size of transfer buffer mov ecx, TRANSFER_BUFFER_SIZE
cmp eax, ecx cmp eax, ecx
jge 2f jge 2f
mov ecx, eax mov ecx, eax
@ -36,32 +26,22 @@ amount_to_write = 4*4
! Copy ecx bytes into the transfer buffer. ! Copy ecx bytes into the transfer buffer.
push ecx mov eax, read_buffer(esp)
mov esi, read_buffer(ebp) call .sys_cpyout
movzx edi, (transfer_buffer_ptr)
mov es, (pmode_ds)
cld
rep movsb
pop ecx
! Write from the transfer buffer to DOS. ! Write from the transfer buffer to DOS.
xchg edx, eax
movb ah, 0x40 movb ah, 0x40
o16 mov dx, (transfer_buffer_ptr) o16 mov bx, file_handle(esp)
mov ebx, 0x210000 call .sys_dpmidos
o16 mov bx, file_handle(ebp) movzx eax, ax
callf (interrupt_ptr)
jnc exit jnc exit
push eax push eax
call __sys_seterrno call __sys_seterrno
pop ecx pop ecx
exit: exit:
pop edi
pop esi
push ss
pop es
leave
ret ret
! vim: sw=4 ts=4 et ! vim: sw=4 ts=4 et

58
plat/msdos386/libsys/sys_scpyout.s Normal file
View file

@ -0,0 +1,58 @@
#
! $Source$
! $State$
! $Revision$
#include "libsysasm.h"
! .sys_scpyout: copy the ASCIIZ string starting from ds:eax to the
! transfer buffer. The resulting ASCIIZ string, including the final null,
! should fit into the entire transfer buffer. Return eax := offset of
! transfer buffer in real mode data segment. Return CF = 1 if and only if
! the ASCIIZ string is too long to fit. Preserve all other registers,
! except the flags.
!
! .sys_sncpyout: copy the ASCIIZ string starting from ds:eax to offset
! edx into the transfer buffer. The resulting ASCIIZ string should occupy
! at most ecx bytes, including the final null. Return eax : offset of
! string in real mode data segment. Return CF = 1 if and only if the ASCIIZ
! string is too long to fit. Preserve all other registers, except the
! flags.
.extern .sys_scpyout
.extern .sys_sncpyout
.sys_scpyout:
push ecx
push edx
mov ecx, TRANSFER_BUFFER_SIZE
xor edx, edx
jmp .cont
.sys_sncpyout:
push ecx
push edx
.cont:
push esi
push edi
mov esi, eax
movzx edi, (transfer_buffer_ptr)
add edi, edx
mov edx, edi
mov es, (pmode_ds)
jcxz .error
.loop:
lodsb
stosb
testb al, al
loopnz .loop
jz .ok
.error:
stc
.ok:
xchg edx, eax
mov edx, ss
mov es, edx
pop edi
pop esi
pop edx
pop ecx
ret

21
plat/msdos386/libsys/sys_xret.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! .sys_zret: if the carry flag is set, then set `errno' from the DOS error ! .sys_zret: if the carry flag is set, then set `errno' from the DOS error
! code in ax, and return an int -1. If the carry flag is clear, just ! code in ax, and return an int -1. If the carry flag is clear, just
@ -18,14 +11,18 @@
! !
! .sys_axret: if the carry flag is set, then set `errno' from the DOS error ! .sys_axret: if the carry flag is set, then set `errno' from the DOS error
! code in ax, and return a shortword -1. If the carry flag is clear, just ! code in ax, and return a shortword -1. If the carry flag is clear, just
! return ax as a return value. ! return eax := ax as a return value.
! !
! .sys_dxaxret: same as .sys_axret, but return -1 or eax := dx:ax as a ! .sys_dxaxret: same as .sys_axret, but return -1 or eax := dx:ax as a
! return value. ! return value.
!
! .sys_toolongret: a file name is too long: set `errno' to E2BIG, and return
! -1.
.extern .sys_zret .extern .sys_zret
.extern .sys_axret .extern .sys_axret
.extern .sys_dxaxret .extern .sys_dxaxret
.extern .sys_toolongret
.sys_zret: .sys_zret:
jc error jc error
xor eax, eax xor eax, eax
@ -34,6 +31,7 @@ no_error:
.sys_axret: .sys_axret:
jc error jc error
movzx eax, ax
ret ret
.sys_dxaxret: .sys_dxaxret:
@ -43,6 +41,11 @@ no_error:
mov eax, edx mov eax, edx
ret ret
.sys_toolongret:
mov (_errno), 7 ! E2BIG
or eax, -1
ret
error: error:
movzx eax, ax movzx eax, ax
push eax push eax

33
plat/msdos386/libsys/unlink.s
View file

@ -3,14 +3,7 @@
! $State$ ! $State$
! $Revision$ ! $Revision$
! Declare segments (the order is important). #include "libsysasm.h"
.sect .text
.sect .rom
.sect .data
.sect .bss
.sect .text
! Remove a file. ! Remove a file.
@ -18,29 +11,13 @@
_unlink: _unlink:
! Copy filename to transfer buffer. ! Copy filename to transfer buffer.
mov ebx, esp mov eax, 4(esp)
push esi call .sys_scpyout
push edi
mov esi, 4(ebx)
movzx edi, (transfer_buffer_ptr)
mov es, (pmode_ds)
cld
1:
lodsb
stosb
testb al, al
jnz 1b
! Make the DOS call. ! Make the DOS call.
mov dx, (transfer_buffer_ptr) xchg edx, eax
movb ah, 0x41 movb ah, 0x41
or ebx, 0x210000 call .sys_dpmidos
callf (interrupt_ptr)
pop edi
pop esi
push ss
pop es
jmp .sys_zret jmp .sys_zret