diff options
| author | Tobias Weingartner <weingart@cvs.openbsd.org> | 1997-04-11 19:12:59 +0000 |
|---|---|---|
| committer | Tobias Weingartner <weingart@cvs.openbsd.org> | 1997-04-11 19:12:59 +0000 |
| commit | 87574036aa7b8287114b589975f6706859abbcff (patch) | |
| tree | 198d583752ad04b45dcf18682718c024721af82d | |
| parent | 3e6807ce1215f6c76143062749f4a4c938b5b370 (diff) | |
Works with .gz kernels now
| -rw-r--r-- | sys/arch/i386/stand/boot/cmd.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/srt0.S | 11 | ||||
| -rw-r--r-- | sys/stand/boot/cmd.c | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/sys/arch/i386/stand/boot/cmd.c b/sys/arch/i386/stand/boot/cmd.c index 07b9d251df0..ea26f0c0ba4 100644 --- a/sys/arch/i386/stand/boot/cmd.c +++ b/sys/arch/i386/stand/boot/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.5 1997/04/08 22:48:29 mickey Exp $ */ +/* $OpenBSD: cmd.c,v 1.6 1997/04/11 19:12:56 weingart Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -339,6 +339,8 @@ execmd(cmd) version, #ifdef DEBUG (debug? "on": "off"), +#else + "not present", #endif cmd->bootdev, cmd->cwd, cmd->image, cmd->addr, cmd->timeout); diff --git a/sys/arch/i386/stand/boot/srt0.S b/sys/arch/i386/stand/boot/srt0.S index 7f79ba00950..88d8125c558 100644 --- a/sys/arch/i386/stand/boot/srt0.S +++ b/sys/arch/i386/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.5 1997/04/07 01:26:00 weingart Exp $ */ +/* $OpenBSD: srt0.S,v 1.6 1997/04/11 19:12:58 weingart Exp $ */ /* $NetBSD: srt0.c,v 1.3 1994/10/27 04:21:59 cgd Exp $ */ /*- @@ -105,6 +105,7 @@ __rtt: movw $0x1234, %ax movw %ax, 0x472 # warm boot + /* Try to use the KBD to reboot system */ movl $0xfe, %eax movl $0x64, %edx outb %al, %dx @@ -125,8 +126,16 @@ __rtt: movl $0xb8000, %ebx movl $0x07310731, (%ebx) #endif + + /* Try to cause a tripple fault... */ lidt _Idtr_reset + xorl %eax, %eax + divl %eax, %eax + + /* Again... */ int $0x8 + + /* Again... */ movl $0, %esp # segment violation ret diff --git a/sys/stand/boot/cmd.c b/sys/stand/boot/cmd.c index 07b9d251df0..ea26f0c0ba4 100644 --- a/sys/stand/boot/cmd.c +++ b/sys/stand/boot/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.5 1997/04/08 22:48:29 mickey Exp $ */ +/* $OpenBSD: cmd.c,v 1.6 1997/04/11 19:12:56 weingart Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -339,6 +339,8 @@ execmd(cmd) version, #ifdef DEBUG (debug? "on": "off"), +#else + "not present", #endif cmd->bootdev, cmd->cwd, cmd->image, cmd->addr, cmd->timeout); |