Drop EDD support detection, though retain configurable use of disk

packet interface.  Add booteasy-style F5 support.  Add no-update
option. Implement various space optimizations and consistency fixes.
This commit is contained in:
Robert Nordier 1998-11-29 14:09:00 +00:00
parent 7d159f8837
commit 12c38b04f1
2 changed files with 110 additions and 104 deletions

View File

@ -13,7 +13,7 @@
# purpose.
#
# $Id: boot0.m4,v 1.1.1.1 1998/10/05 10:08:37 rnordier Exp $
# $Id: boot0.m4,v 1.2 1998/10/19 19:13:53 rnordier Exp $
define(_al,0x0)dnl
define(_cl,0x1)dnl
@ -52,26 +52,22 @@ define(_bx_,0x7)dnl
define(o16,`.byte 0x66')dnl
define(addwia,`.byte 0x5; .word $1')dnl
define(btwrm,`.byte 0xf; .byte 0xa3; .byte 0x6 | ($1 << 0x3); .word $2')dnl
define(btswrm,`.byte 0xf; .byte 0xab; .byte 0x6 | ($1 << 0x3); .word $2')dnl
define(cmpwmr,`.byte 0x3b; .byte ($2 << 0x3) | 0x6; .word $1')dnl
define(btwr1,`.word 0xa30f; .byte 0x40 | ($1 << 0x3) | $3; .byte $2')dnl
define(btswr1,`.word 0xab0f; .byte 0x40 | ($1 << 0x3) | $3; .byte $2')dnl
define(cmpbmr,`.byte 0x3a; .byte 0x6 | ($2 << 0x3); .word $1')dnl
define(cmpw1r,`.byte 0x3b; .byte 0x40 | ($3 << 0x3) | $2; .byte $1')dnl
define(cmpwi2,`.byte 0x81; .byte 0xb8 | $3; .word $2; .word $1')dnl
define(cmpwir,`.byte 0x81; .byte 0xf8 | $2; .word $1')dnl
define(addwir,`.byte 0x83; .byte 0xc0 | $2; .byte $1')dnl
define(movbr0,`.byte 0x88; .byte ($1 << 0x3) | $2')dnl
define(movbrm,`.byte 0x88; .byte 0x6 | ($1 << 0x3); .word $2')dnl
define(movbr1,`.byte 0x88; .byte 0x40 | ($1 << 0x3) | $3; .byte $2')dnl
define(movwr1,`.byte 0x89; .byte 0x40 | ($1 << 0x3) | $3; .byte $2')dnl
define(movb0r,`.byte 0x8a; .byte ($2 << 0x3) | $1')dnl
define(movbmr,`.byte 0x8a; .byte 0x6 | ($2 << 0x3); .word $1')dnl
define(movb1r,`.byte 0x8a; .byte 0x40 | ($3 << 0x3) | $2; .byte $1')dnl
define(movw1r,`.byte 0x8b; .byte 0x40 | ($3 << 0x3) | $2; .byte $1')dnl
define(movws1,`.byte 0x8c; .byte 0x40 | ($1 << 0x3) | $3; .byte $2')dnl
define(leaw1r,`.byte 0x8d; .byte 0x40 | ($3 << 0x3) | $2; .byte $1')dnl
define(movbma,`.byte 0xa0; .word $1')dnl
define(movbam,`.byte 0xa2; .word $1')dnl
define(movwir,`.byte 0xb8 | $2; .word $1')dnl
define(movbi0,`.byte 0xc6; .byte $2; .byte $1')dnl
define(callwi,`.byte 0xe8; .word $1 - . - 0x2')dnl
define(jmpnwi,`.byte 0xe9; .word $1 - . - 0x2')dnl
define(tstbim,`.byte 0xf6; .byte 0x6; .word $2; .byte $1')dnl
define(tstbi1,`.byte 0xf6; .byte 0x40 | $3; .byte $2; .byte $1')dnl
define(incb1,`.byte 0xfe; .byte 0x40 | $2; .byte $1')dnl

View File

@ -13,19 +13,28 @@
# purpose.
#
# $Id: boot0.s,v 1.3 1998/10/10 14:03:03 rnordier Exp $
# $Id: boot0.s,v 1.4 1998/10/19 19:13:53 rnordier Exp $
# A 512-byte boot manager.
.set LOAD,0x7c00 # Load address
.set ORIGIN,0x600 # Relocation address
.set ORIGIN,0x600 # Execution address
.set PRT_OFF,0x1be # Partition table
.set FAKE,0x810 # Partition entry
.set MNUOPT,0x81c # Menu options
.set FAKE,0x810 # Partition entry
.set NHRDRV,0x475 # Number of hard drives
.set TBL0SZ,0x3 # Table 0 size
.set TBL1SZ,0xa # Table 1 size
.set _NXTDRV,-0x47 # Drive number
.set _OPT,-0x46 # Default option
.set _FLAG,-0x45 # Flags
.set _TICKS,-0x44 # Timeout ticks
.set _FAKE,0x10 # Fake partition entry
.set _MNUOPT,0x1c # Menu options
.globl start # Entry point
start: cld # String ops inc
start: cld # String ops inc
xorl %eax,%eax # Zero
movl %eax,%es # Address
movl %eax,%ds # data
@ -36,85 +45,93 @@ start: cld # String ops inc
movwir(0x100,_cx) # Word count
rep # Relocate
movsl # code
movl %edi,%ebp # Address variables
movb $0x10,%cl # Words to clear
rep # Zero
stosl # them
incb1(-0xe,_di_) # Sector number
jmpnwi(main-LOAD+ORIGIN) # To relocated code
main: movbrm(_dl,FAKE) # Save drive number
main: movbr1(_dl,_FAKE,_bp_) # Save drive number
callwi(putn) # To new line
movwir(partbl,_bx) # Partition table
xorl %edx,%edx # Item
main.1: movbr0(_dh,_bx_) # Mark inactive
main.1: movbr0(_dh,_bx_) # Mark inactive
movb1r(0x4,_bx_,_al) # Load type
movwir(table0,_di) # Exclusion table
movb $0x3,%cl # Entries
movwir(tables,_di) # Lookup tables
movb $TBL0SZ,%cl # Entries
repne # Exclude
scasb # partition?
je main.3 # Yes
movb $0xa,%cl # Entries
movb $TBL1SZ,%cl # Entries
repne # Known
scasb # type?
jne main.2 # No
leaw1r(0xa,_di_,_di) # Name table
main.2: movwir(item,_si) # Display start
callwi(putkey) # of menu item
movl %edi,%esi # Set pointer
lodsb # to
cwde # partition
add %eax,%esi # description
callwi(puts) # Display it
btswrm(_dx,MNUOPT) # Flag option enabled
main.3: addb $0x10,%bl # Next entry
addwir(TBL1SZ,_di) # Adjust
main.2: movb0r(_di_,_cl) # Partition
addl %ecx,%edi # description
callwi(putx) # Display it
main.3: addwir(0x10,_bx) # Next entry
incl %edx # Next item
cmpb $0x4,%dl # Done?
jb main.1 # No
movwir(prompt,_si) # Display
movb1r(_FAKE,_bp_,_al) # Drive number
subb $0x80-0x1,%al # Does next
cmpbmr(NHRDRV,_al) # drive exist?
jb main.4 # Yes
decb %al # Already drive 0?
jz main.5 # Yes
xorb %al,%al # Drive 0
main.4: addb $'0'|0x80,%al # Save
movbr1(_al,_NXTDRV,_bp_) # it
movwir(drive,_di) # Display
callwi(putx) # item
main.5: movwir(prompt,_si) # Display
callwi(putstr) # prompt
movbmr(opt,_dl) # Display
movb1r(_OPT,_bp_,_dl) # Display
decl %esi # default
callwi(putkey) # key
xorb %ah,%ah # BIOS: Get
int $0x1a # system time
movl %edx,%edi # Save
main.4: movb $0x1,%ah # BIOS: Check
main.6: movb $0x1,%ah # BIOS: Check
int $0x16 # for keypress
jnz main.6 # Have one
jnz main.9 # Have one
xorb %ah,%ah # BIOS: Get
int $0x1a # system time
subl %edi,%edx # Elapsed time
cmpwmr(ticks,_dx) # Timeout?
jb main.4 # No
jmp main.7 # Join common code
main.5: movb $0x7,%al # Signal
cmpw1r(_TICKS,_bp_,_dx) # Timeout?
jb main.6 # No
main.7: movb1r(_OPT,_bp_,_al) # Load default
jmp main.10 # Join common code
main.8: movb $0x7,%al # Signal
callwi(putchr) # error
main.6: xorb %ah,%ah # BIOS: Get
main.9: xorb %ah,%ah # BIOS: Get
int $0x16 # keypress
movb %ah,%al # Scan code
cmpb $0x1c,%al # Enter pressed?
jne main.8 # No
main.7: movbma(opt) # Load
jmp main.9 # default
main.8: subb $0x3b,%al # Less F1 scan code
jb main.5 # Not a function key
main.9: cmpb $0x4,%al # F1..F5?
ja main.5 # No
je main.7 # No
subb $0x3b,%al # Less F1 scan code
cmpb $0x4,%al # F1..F5?
ja main.8 # No
main.10: cwtl # Option
btwr1(_ax,_MNUOPT,_bp_) # enabled?
jnc main.8 # No
movwir(FAKE,_si) # Partition entry
movb0r(_si_,_dl) # Load drive number
jne main.10 # If not F5
xorb $0x1,%dl # Toggle drive
jmp main.11 # number
main.10: cwtl # Option
btwrm(_ax,MNUOPT) # enabled?
jnc main.5 # No
movbam(opt) # Save option
movb1r(_NXTDRV,_bp_,_dl) # Next drive
subb $'0',%dl # number
cmpb $0x4,%al # F5 pressed?
je main.11 # Yes
movb0r(_si_,_dl) # Drive number
movbr1(_al,_OPT,_bp_) # Save option
shlb $0x4,%al # Point to
addwia(partbl) # partition
xchgl %esi,%eax # entry
xchgl %esi,%eax # entry
tstbi1(0x40,_FLAG,_bp_) # No updates?
jnz main.11 # Yes
movbi0(0x80,_si_) # Flag active
pushl %esi # Save
movl %eax,%esi # Fake partition entry
xchgl %esi,%eax # Fake partition entry
movwir(start,_bx) # Data to write
movwir(0x301,_ax) # Write sector
callwi(intx13) # to disk
@ -122,42 +139,47 @@ main.10: cwtl # Option
main.11: movwir(LOAD,_bx) # Address for read
movwir(0x201,_ax) # Read sector
callwi(intx13) # from disk
jc main.5 # If error
jc main.8 # If error
cmpwi2(0xaa55,0x1fe,_bx_) # Bootable?
jne main.5 # No
jne main.8 # No
movwir(crlf,_si) # Leave some
callwi(puts) # space
jmp *%ebx # Invoke bootstrap
# Display routines
putkey: movb $'F',%al # Display
putkey: movb $'F',%al # Display
callwi(putchr) # 'F'
movb $'1',%al # Prepare
addb %dl,%al # digit
jmp putstr.1 # Display the rest
putx: btswr1(_dx,_MNUOPT,_bp_) # Enable menu option
movwir(item,_si) # Display
callwi(putkey) # key
movl %edi,%esi # Display the rest
puts: callwi(putstr) # Display string
putn: movwir(crlf,_si) # To next line
putstr: lodsb # Get byte
testb $0x80,%al # End of string?
putstr: lodsb # Get byte
testb $0x80,%al # End of string?
jnz putstr.2 # Yes
putstr.1: callwi(putchr) # Display char
jmp putstr # Continue
putstr.2: andb $~0x80,%al # Clear MSB
putstr.2: andb $~0x80,%al # Clear MSB
putchr: pushl %ebx # Save
movwir(0x7,_bx) # Page:attribute
putchr: pushl %ebx # Save
movwir(0x7,_bx) # Page:attribute
movb $0xe,%ah # BIOS: Display
int $0x10 # character
popl %ebx # Restore
ret # To caller
# Disk I/O
# Disk I/O routine
intx13: cli # Disable interrupts
intx13: cli # Disable interrupts
movb1r(0x1,_si_,_dh) # Load head
movw1r(0x2,_si_,_cx) # Load cylinder:sector
o16 # Load
@ -170,52 +192,38 @@ intx13: cli # Disable interrupts
o16 # LBA
movwr1(_di,0x8,_si_) # address
sti # Enable interrupts
tstbim(0x80,flags) # Try for extensions?
jz intx13.2 # No
pushl %ecx # Save
pushl %ebx # caller's
movwir(0x55aa,_bx) # Magic
pushl %eax # Save
movb $0x41,%ah # BIOS: EDD extensions
int $0x13 # present?
popl %eax # Restore
jc intx13.1 # No
cmpwir(0xaa55,_bx) # Magic?
jne intx13.1 # No
testb $0x1,%cl # Use packet?
tstbi1(0x80,_FLAG,_bp_) # Try for extensions?
jz intx13.1 # No
orb $0x40,%ah # Use EDD
intx13.1: popl %ebx # Restore
popl %ecx # caller's
testb $0x40,%ah # Use EDD?
jz intx13.2 # No
xorb %al,%al # Verify off
intx13.2: int $0x13 # BIOS: Disk I/O
orb $0x40,%ah # Use disk packet
decl %eax # Verify off
intx13.1: int $0x13 # BIOS: Disk I/O
ret # To caller
# Menu strings
crlf: .ascii "\r"; .byte '\n'|0x80
item: .ascii " "; .byte ' '|0x80
item: .ascii " "; .byte ' '|0x80
prompt: .ascii "\nDefault:"; .byte ' '|0x80
crlf: .ascii "\r"; .byte '\n'|0x80
# Partition type tables
table0: .byte 0x0, 0x5, 0xf
table1: .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83
tables:
.byte 0x0, 0x5, 0xf
.byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83
.byte 0xa5, 0xa6
.byte os_misc-.-1 # Unknown
.byte os_dos-.-1 # DOS
.byte os_dos-.-1 # DOS
.byte os_dos-.-1 # DOS
.byte os_dos-.-1 # Windows
.byte os_dos-.-1 # Windows
.byte os_dos-.-1 # Windows
.byte os_unix-.-1 # UNIX
.byte os_linux-.-1 # Linux
.byte os_freebsd-.-1 # FreeBSD
.byte os_bsd-.-1 # OpenBSD
.byte os_misc-. # Unknown
.byte os_dos-. # DOS
.byte os_dos-. # DOS
.byte os_dos-. # DOS
.byte os_dos-. # Windows
.byte os_dos-. # Windows
.byte os_dos-. # Windows
.byte os_unix-. # UNIX
.byte os_linux-. # Linux
.byte os_freebsd-. # FreeBSD
.byte os_bsd-. # OpenBSD
os_misc: .ascii "?"; .byte '?'|0x80
os_dos: .ascii "DO"; .byte 'S'|0x80
@ -224,13 +232,15 @@ os_linux: .ascii "Linu"; .byte 'x'|0x80
os_freebsd: .ascii "Free"
os_bsd: .ascii "BS"; .byte 'D'|0x80
.org PRT_OFF-0x4,0x90
.org PRT_OFF-0xb,0x90
drive: .ascii "Drive "
drvnum: .byte 0x0
opt: .byte 0x0 # Option
flags: .byte FLAGS # Flags
ticks: .word TICKS # Delay
partbl: .fill 0x40,0x1,0x0 # Partition table
partbl: .fill 0x40,0x1,0x0 # Partition table
.word 0xaa55 # Magic number
break: # Uninitialized data