diff options
author | kato <kato@FreeBSD.org> | 2007-03-17 05:30:03 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 2007-03-17 05:30:03 +0000 |
commit | ab0a579df3ad0d678101197aa3fcae7a0ffcec0e (patch) | |
tree | 2678d42936d5deb8f59ad8b1fdf29758abc41417 /sys | |
parent | 9fd1f2e0cc27baf1a12429f3f0fd648e5b3652bb (diff) | |
download | FreeBSD-src-ab0a579df3ad0d678101197aa3fcae7a0ffcec0e.zip FreeBSD-src-ab0a579df3ad0d678101197aa3fcae7a0ffcec0e.tar.gz |
- Moved the uninitialized variables from the data to the bss section.
- Fixed typos in comment.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/pc98/boot0.5/boot.s | 2 | ||||
-rw-r--r-- | sys/boot/pc98/boot0.5/boot0.5.s | 21 | ||||
-rw-r--r-- | sys/boot/pc98/boot0.5/disk.s | 10 |
3 files changed, 19 insertions, 14 deletions
diff --git a/sys/boot/pc98/boot0.5/boot.s b/sys/boot/pc98/boot0.5/boot.s index 1a3bfc7..9d11206 100644 --- a/sys/boot/pc98/boot0.5/boot.s +++ b/sys/boot/pc98/boot0.5/boot.s @@ -60,7 +60,7 @@ boot: movw parttable(%si), %ax movw %ax, b_cylinder - # Step 2: Calculate egment address of bootstrap routine + # Step 2: Calculate the segment address of the bootstrap routine movw $0x1d00, %ax movw b_secsize, %cx shrw %cx diff --git a/sys/boot/pc98/boot0.5/boot0.5.s b/sys/boot/pc98/boot0.5/boot0.5.s index 80dbe2a..8c99ba7 100644 --- a/sys/boot/pc98/boot0.5/boot0.5.s +++ b/sys/boot/pc98/boot0.5/boot0.5.s @@ -60,7 +60,7 @@ normalmode: jmp exit # No hard drives drives_found: - # Setup sector size depended parameters + # Setup sector size dependent parameters movw %si, %cx # %cx = number of devices setup_loop: movw %cx, %di @@ -254,16 +254,9 @@ showunit: ret .data - .global curdevice, daua, secsize, defflagoff, defpartoff - .global maxpart, partoff, ndevice + .global curdevice, ndevice ndevice: .word 0 # number of device curdevice: .word 0 # current device -daua: .space 12 # DA/DU list -secsize: .space 12 * 2 # Sector soize -defflagoff: .space 12 * 2 -defpartoff: .space 12 * 2 -maxpart: .space 12 * 2 -partoff: .space 12 * 2 .global ishireso ishireso: .byte 0 @@ -288,3 +281,13 @@ msg_usage9: .asciz "LEGEND" msg_usage10: .asciz ">>: selected device/slice" msg_usage11: .asciz "*: default slice to boot" msg_usage12: .asciz "!: unbootable slice" + + .bss + .global daua, secsize, defflagoff, defpartoff + .global maxpart, partoff +daua: .space 12 # DA/DU list +secsize: .space 12 * 2 # Sector soize +defflagoff: .space 12 * 2 +defpartoff: .space 12 * 2 +maxpart: .space 12 * 2 +partoff: .space 12 * 2 diff --git a/sys/boot/pc98/boot0.5/disk.s b/sys/boot/pc98/boot0.5/disk.s index 9d0db21..162dce9 100644 --- a/sys/boot/pc98/boot0.5/disk.s +++ b/sys/boot/pc98/boot0.5/disk.s @@ -284,11 +284,13 @@ no_scsi_unit: ret .data - .global partnum, parttable, defpartflag, defpartnum, npartition -partnum: .space 32 # Index of parttable -parttable: .space 1024 # Copy of valid partition table + .global defpartflag, defpartnum, npartition defpartflag: .byte 0 defpartnum: .byte 0 npartition: .word 0 # number of partitions + .bss -iplbuf: .space 0x400 + .global partnum, parttable +iplbuf: .space 0x400 # Read buffer for IPL +partnum: .space 32 # Index of parttable +parttable: .space 1024 # Copy of valid partition table |