diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-29 11:35:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-07-29 11:35:17 +0000 |
| commit | b190045b10d9c575d415b9c6e7f13dc6d0303000 (patch) | |
| tree | cccf1c7f67fa99cd6dc1bf90fd8380e4e7c9a39f /usr/src/boot/sys | |
| parent | fd851958ac43e040125201c92bdfbe0cd5e4ad03 (diff) | |
| parent | 5c1597bcad8dabd41c0a919fb8acfabd8054e924 (diff) | |
| download | illumos-joyent-release-20200730.tar.gz | |
[illumos-gate merge]release-20200730
commit 5c1597bcad8dabd41c0a919fb8acfabd8054e924
12992 loader: logo-illumos.4th needs to have mode resets
commit abe1e6b305e672d0eedeb6b52003acac658c8371
12982 ambiguous instructions require an explicit suffix
commit c3ae3afa3e57b39e29577c4b791adbe511bb7e3f
12916 bhyve should be able to limit vmx capabilities
12917 bhyve should always use Unrestricted Guest
commit 22e68029451fec16a660c22ed1304b05ed67f43d
12973 add support for PCI-E rge cards
Diffstat (limited to 'usr/src/boot/sys')
| -rw-r--r-- | usr/src/boot/sys/boot/forth/logo-illumos.4th | 38 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/i386/cdboot/cdboot.S | 8 |
2 files changed, 23 insertions, 23 deletions
diff --git a/usr/src/boot/sys/boot/forth/logo-illumos.4th b/usr/src/boot/sys/boot/forth/logo-illumos.4th index 656f5ff53b..84948ec3ad 100644 --- a/usr/src/boot/sys/boot/forth/logo-illumos.4th +++ b/usr/src/boot/sys/boot/forth/logo-illumos.4th @@ -38,25 +38,25 @@ 0 0 0 0 0 s" /boot/illumos.png" fb-putimage if 2drop exit then - s" @[33m, " logo+ - s" @[33m,./% @[31m& " logo+ - s" @[33m(****@[31m*( " logo+ - s" @[33m*/*@[31m// " logo+ - s" @[33m*,//@[31m/(( " logo+ - s" @[33m,*/@[31m/((/% " logo+ - s" @[33m//@[31m/((((% " logo+ - s" @[33m,*@[31m/(((((% @[33m&@[31m#///((&" logo+ - s" @[33m./@[31m//((((((% %/(((/ " logo+ - s" @[33m./@[31m///(((((///((, " logo+ - s" @[33m.*//@[31m//(((((((((( " logo+ - s" ./((((((((/ " logo+ - s" (/((((((( " logo+ - s" ,,((((((/ " logo+ - s" /(((( " logo+ - s" %/(((( " logo+ - s" @[33m&@[31m%#/((((. " logo+ - s" @[33m,@[31m( ,/ /(/ " logo+ - s" ,/@[m " logo+ + s" @[33m,@[m " logo+ + s" @[33m,./% @[31m&@[m " logo+ + s" @[33m(****@[31m*(@[m " logo+ + s" @[33m*/*@[31m//@[m " logo+ + s" @[33m*,//@[31m/((@[m " logo+ + s" @[33m,*/@[31m/((/%@[m " logo+ + s" @[33m//@[31m/((((%@[m " logo+ + s" @[33m,*@[31m/(((((%@[m @[33m&@[31m#///((&@[m" logo+ + s" @[33m./@[31m//((((((%@[m @[31m%/(((/@[m " logo+ + s" @[33m./@[31m///(((((///((,@[m " logo+ + s" @[33m.*//@[31m//((((((((((@[m " logo+ + s" @[31m./((((((((/@[m " logo+ + s" @[31m(/(((((((@[m " logo+ + s" @[31m,,((((((/@[m " logo+ + s" @[31m/((((@[m " logo+ + s" @[31m%/((((@[m " logo+ + s" @[33m&@[31m%#/((((.@[m " logo+ + s" @[33m,@[31m(@[m @[31m,/@[m @[31m/(/@[m " logo+ + s" @[31m,/@[m " logo+ 2drop ; diff --git a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S index 22e277eace..3ab75c1fb2 100644 --- a/usr/src/boot/sys/boot/i386/cdboot/cdboot.S +++ b/usr/src/boot/sys/boot/i386/cdboot/cdboot.S @@ -34,7 +34,7 @@ # # Basically, we first create a set of boot arguments to pass to the loaded # binary. Then we attempt to load /boot/loader from the CD we were booted -# off of. +# from. # #include <bootargs.h> @@ -136,7 +136,7 @@ real_start: cld # string ops inc stosl # to zero mov drive,%dl # Store BIOS boot device mov %dl,0x4(%bx) # in kargs->bootdev - or $KARGS_FLAGS_CD,0x8(%bx) # kargs->bootflags |= + orb $KARGS_FLAGS_CD,0x8(%bx) # kargs->bootflags |= # KARGS_FLAGS_CD # # Load Volume Descriptor @@ -494,7 +494,7 @@ twiddle: push %ax # Save # legacy-free and simply doesn't have a keyboard controller. # Thus, the A20 line is already enabled. # -seta20: cli # Disable interrupts +seta20: cli # Disable interrupts xor %cx,%cx # Clear seta20.1: inc %cx # Increment, overflow? jz seta20.3 # Yes @@ -518,7 +518,7 @@ hex8: pushl %eax # Save shrb $0x4,%al # Do upper call hex8.1 # 4 popl %eax # Restore -hex8.1: andb $0xf,%al # Get lower 4 +hex8.1: andb $0xf,%al # Get lower 4 cmpb $0xa,%al # Convert sbbb $0x69,%al # to hex das # digit |