Module Name: src
Committed By: jakllsch
Date: Mon Dec 20 01:12:45 UTC 2010
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
src/sys/arch/i386/stand/dosboot: main.c
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/i386/stand/lib/crt/dos: start_dos.S
src/sys/arch/i386/stand/netboot: main.c start_rom.S
src/sys/arch/i386/stand/pxeboot: main.c start_pxe.S
Removed Files:
src/sys/arch/i386/stand/lib: panic.c
Log Message:
MI libsa provides panic() and exit() functions, no need to provide our own.
As MI libsa exit() calls panic() with a "exit" message, don't use it if we
print our own farewell or have already panic()ed.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/dosboot/main.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/arch/i386/stand/lib/panic.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/lib/crt/dos/start_dos.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/netboot/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/netboot/start_rom.S
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/stand/pxeboot/main.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/pxeboot/start_pxe.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.49 src/sys/arch/i386/stand/boot/boot2.c:1.50
--- src/sys/arch/i386/stand/boot/boot2.c:1.49 Sat Nov 6 23:07:46 2010
+++ src/sys/arch/i386/stand/boot/boot2.c Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.49 2010/11/06 23:07:46 jym Exp $ */
+/* $NetBSD: boot2.c,v 1.50 2010/12/20 01:12:44 jakllsch Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -414,7 +414,6 @@
reboot();
/* Note: we shouldn't get to this point! */
panic("Could not reboot!");
- exit(0);
}
void
Index: src/sys/arch/i386/stand/dosboot/main.c
diff -u src/sys/arch/i386/stand/dosboot/main.c:1.29 src/sys/arch/i386/stand/dosboot/main.c:1.30
--- src/sys/arch/i386/stand/dosboot/main.c:1.29 Sat Mar 21 15:01:56 2009
+++ src/sys/arch/i386/stand/dosboot/main.c Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.29 2009/03/21 15:01:56 ad Exp $ */
+/* $NetBSD: main.c,v 1.30 2010/12/20 01:12:44 jakllsch Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -337,7 +337,7 @@
command_quit(char *arg)
{
printf("Exiting... goodbye...\n");
- exit(0);
+ _rtt();
}
void
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.29 src/sys/arch/i386/stand/lib/Makefile:1.30
--- src/sys/arch/i386/stand/lib/Makefile:1.29 Thu Nov 19 22:13:17 2009
+++ src/sys/arch/i386/stand/lib/Makefile Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/11/19 22:13:17 dsl Exp $
+# $NetBSD: Makefile,v 1.30 2010/12/20 01:12:44 jakllsch Exp $
S?= ${.CURDIR}/../../../..
@@ -21,7 +21,7 @@
SRCS+= biosmem.S getextmemx.c biosmemx.S printmemlist.c
SRCS+= pread.c menuutils.c parseutils.c
SRCS+= bootinfo.c bootinfo_biosgeom.c bootinfo_memmap.c
-SRCS+= startprog.S multiboot.S panic.c
+SRCS+= startprog.S multiboot.S
SRCS+= biosgetsystime.S cpufunc.S bootmenu.c
SRCS+= realprot.S message.S message32.S dump_eax.S pvcopy.S putstr.S
SRCS+= rasops.c vbe.c biosvbe.S
Index: src/sys/arch/i386/stand/lib/crt/dos/start_dos.S
diff -u src/sys/arch/i386/stand/lib/crt/dos/start_dos.S:1.9 src/sys/arch/i386/stand/lib/crt/dos/start_dos.S:1.10
--- src/sys/arch/i386/stand/lib/crt/dos/start_dos.S:1.9 Sun Mar 4 05:59:59 2007
+++ src/sys/arch/i386/stand/lib/crt/dos/start_dos.S Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: start_dos.S,v 1.9 2007/03/04 05:59:59 christos Exp $ */
+/* $NetBSD: start_dos.S,v 1.10 2010/12/20 01:12:44 jakllsch Exp $ */
/*
* startup for DOS .COM programs
@@ -188,7 +188,7 @@
stosb
call _C_LABEL(doscommain)
-ENTRY(exit)
+ENTRY(_rtt)
call _C_LABEL(prot_to_real)
.code16
ENTRY(exit16)
Index: src/sys/arch/i386/stand/netboot/main.c
diff -u src/sys/arch/i386/stand/netboot/main.c:1.17 src/sys/arch/i386/stand/netboot/main.c:1.18
--- src/sys/arch/i386/stand/netboot/main.c:1.17 Sat Mar 21 15:01:56 2009
+++ src/sys/arch/i386/stand/netboot/main.c Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.17 2009/03/21 15:01:56 ad Exp $ */
+/* $NetBSD: main.c,v 1.18 2010/12/20 01:12:44 jakllsch Exp $ */
/*
* Copyright (c) 1996
@@ -123,7 +123,7 @@
command_quit(char *arg)
{
printf("Exiting... goodbye...\n");
- exit(0);
+ _rtt();
}
void
Index: src/sys/arch/i386/stand/netboot/start_rom.S
diff -u src/sys/arch/i386/stand/netboot/start_rom.S:1.2 src/sys/arch/i386/stand/netboot/start_rom.S:1.3
--- src/sys/arch/i386/stand/netboot/start_rom.S:1.2 Sun Dec 11 12:17:49 2005
+++ src/sys/arch/i386/stand/netboot/start_rom.S Mon Dec 20 01:12:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: start_rom.S,v 1.2 2005/12/11 12:17:49 christos Exp $ */
+/* $NetBSD: start_rom.S,v 1.3 2010/12/20 01:12:44 jakllsch Exp $ */
/*
* ROM startup
@@ -181,8 +181,7 @@
.code32
call _C_LABEL(main)
- .globl _C_LABEL(exit)
-_C_LABEL(exit):
+ENTRY(_rtt)
call _C_LABEL(prot_to_real)
.code16
Index: src/sys/arch/i386/stand/pxeboot/main.c
diff -u src/sys/arch/i386/stand/pxeboot/main.c:1.26 src/sys/arch/i386/stand/pxeboot/main.c:1.27
--- src/sys/arch/i386/stand/pxeboot/main.c:1.26 Sat Nov 6 23:07:46 2010
+++ src/sys/arch/i386/stand/pxeboot/main.c Mon Dec 20 01:12:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.26 2010/11/06 23:07:46 jym Exp $ */
+/* $NetBSD: main.c,v 1.27 2010/12/20 01:12:45 jakllsch Exp $ */
/*
* Copyright (c) 1996
@@ -212,7 +212,6 @@
reboot();
/* Note: we shouldn't get to this point! */
panic("Could not reboot!");
- exit(0);
}
void
Index: src/sys/arch/i386/stand/pxeboot/start_pxe.S
diff -u src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.4 src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.5
--- src/sys/arch/i386/stand/pxeboot/start_pxe.S:1.4 Fri Nov 11 21:42:13 2005
+++ src/sys/arch/i386/stand/pxeboot/start_pxe.S Mon Dec 20 01:12:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: start_pxe.S,v 1.4 2005/11/11 21:42:13 dsl Exp $ */
+/* $NetBSD: start_pxe.S,v 1.5 2010/12/20 01:12:45 jakllsch Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -89,8 +89,7 @@
/* ...and call main()! */
call _C_LABEL(main)
- .globl _C_LABEL(exit)
-_C_LABEL(exit):
+ENTRY(_rtt)
call _C_LABEL(prot_to_real)
.code16
movw $efail, %si
