diff --git a/sys/arch/sun3/conf/TIMESINK b/sys/arch/sun3/conf/TIMESINK index 6ecab6f01954..69371b0da863 100644 --- a/sys/arch/sun3/conf/TIMESINK +++ b/sys/arch/sun3/conf/TIMESINK @@ -1,6 +1,6 @@ # # config file for TIMESINK, Adam's test machine -# $Id: TIMESINK,v 1.10 1994/03/01 08:24:02 glass Exp $ +# $Id: TIMESINK,v 1.11 1994/04/17 06:31:10 glass Exp $ # include "std.sun3" @@ -30,6 +30,7 @@ options INET # IP prototol stack support # Sun3-specific options options COMPAT_SUNOS +options COMPAT_09 # Sun3-specific debugging options options CONTEXT_DEBUG @@ -39,8 +40,6 @@ options EXEC_DEBUG #options SYSCALL_DEBUG #options LAME_ZS -include "TIMESINK.nfsdiskless" # utter hack for NFS diskless bootstrapping - config netbsd swap nfs le0 at obio? addr ? level 3 diff --git a/sys/arch/sun3/dev/prom.c b/sys/arch/sun3/dev/prom.c index 5269b1bdcab5..c7ac3af440ea 100644 --- a/sys/arch/sun3/dev/prom.c +++ b/sys/arch/sun3/dev/prom.c @@ -273,7 +273,6 @@ promcninit(cp) struct consdev *cp; { cp->cn_tp = NULL; - mon_printf("prom console initialized\n"); } promcngetc(dev) diff --git a/sys/arch/sun3/sun3/locore2.c b/sys/arch/sun3/sun3/locore2.c index 6f20aa12603d..16d4197065c3 100644 --- a/sys/arch/sun3/sun3/locore2.c +++ b/sys/arch/sun3/sun3/locore2.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Header: /cvsroot/src/sys/arch/sun3/sun3/locore2.c,v 1.17 1994/03/01 08:23:15 glass Exp $ + * $Header: /cvsroot/src/sys/arch/sun3/sun3/locore2.c,v 1.18 1994/04/17 06:31:30 glass Exp $ */ #include @@ -76,7 +76,6 @@ static void initialize_vector_table() { int i; - mon_printf("initializing vector table (starting)\n"); old_vector_table = getvbr(); for (i = 0; i < NVECTORS; i++) { if (vector_table[i] == COPY_ENTRY) @@ -84,7 +83,6 @@ static void initialize_vector_table() } setvbr((unsigned int *) vector_table); orig_nmi_vector = get_vector_entry(VEC_LEVEL_7_INT); - mon_printf("initializing vector table (finished)\n"); } vm_offset_t high_segment_alloc(npages) @@ -232,7 +230,6 @@ void sun3_vm_init() } va = eva; } - mon_printf("monitor protected\n"); /* * MONSHORTSEG contains MONSHORTPAGE which is some stupid page * allocated by the monitor. One page, in an otherwise empty segment. @@ -270,8 +267,6 @@ void sun3_vm_init() */ temp_seg = sun3_round_seg(virtual_avail); set_temp_seg_addr(temp_seg); - mon_printf("%x virtual bytes lost allocating temporary segment for pmap\n", - temp_seg - virtual_avail); set_segmap(temp_seg, SEGINV); virtual_avail = temp_seg + NBSG; @@ -312,7 +307,6 @@ void sun3_vm_init() virtual_avail = eva; - mon_printf("unmapping range: %x to %x\n", virtual_avail, virtual_end); /* * unmap kernel virtual space (only segments. if it squished ptes, bad * things might happen. @@ -431,7 +425,7 @@ void sun3_verify_hardware() } if (!cpu_match) mon_panic("kernel not configured for the Sun 3 model\n"); - mon_printf("kernel configured for Sun 3/%s\n", cpu_string); + mon_printf("configured for Sun 3/%s\n", cpu_string); } /* @@ -572,7 +566,6 @@ unsigned int get_interrupt_reg() void sun3_bootstrap() { - static char hello[] = "hello world"; int i; extern int cold, astpending; @@ -582,7 +575,6 @@ void sun3_bootstrap() */ cold = 1; - mon_printf("%s\n", hello); mon_printf("\nPROM Version: %x\n", romp->romvecVersion); sun3_monitor_hooks(); diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index e249ec514a9f..56409535d4b1 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -116,7 +116,7 @@ void identifycpu() * framebuffer placement problems. could be moved later. */ - printf("Model:\tSun 3/%s\n", cpu_string); + printf("Model: Sun 3/%s\n", cpu_string); /* should eventually include whether it has a VAC, mc6888x version, etc */ } diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c index 04bafa5bc32e..4e577c417197 100644 --- a/sys/arch/sun3/sun3/sun3_startup.c +++ b/sys/arch/sun3/sun3/sun3_startup.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Header: /cvsroot/src/sys/arch/sun3/sun3/Attic/sun3_startup.c,v 1.17 1994/03/01 08:23:15 glass Exp $ + * $Header: /cvsroot/src/sys/arch/sun3/sun3/Attic/sun3_startup.c,v 1.18 1994/04/17 06:31:30 glass Exp $ */ #include @@ -76,7 +76,6 @@ static void initialize_vector_table() { int i; - mon_printf("initializing vector table (starting)\n"); old_vector_table = getvbr(); for (i = 0; i < NVECTORS; i++) { if (vector_table[i] == COPY_ENTRY) @@ -84,7 +83,6 @@ static void initialize_vector_table() } setvbr((unsigned int *) vector_table); orig_nmi_vector = get_vector_entry(VEC_LEVEL_7_INT); - mon_printf("initializing vector table (finished)\n"); } vm_offset_t high_segment_alloc(npages) @@ -232,7 +230,6 @@ void sun3_vm_init() } va = eva; } - mon_printf("monitor protected\n"); /* * MONSHORTSEG contains MONSHORTPAGE which is some stupid page * allocated by the monitor. One page, in an otherwise empty segment. @@ -270,8 +267,6 @@ void sun3_vm_init() */ temp_seg = sun3_round_seg(virtual_avail); set_temp_seg_addr(temp_seg); - mon_printf("%x virtual bytes lost allocating temporary segment for pmap\n", - temp_seg - virtual_avail); set_segmap(temp_seg, SEGINV); virtual_avail = temp_seg + NBSG; @@ -312,7 +307,6 @@ void sun3_vm_init() virtual_avail = eva; - mon_printf("unmapping range: %x to %x\n", virtual_avail, virtual_end); /* * unmap kernel virtual space (only segments. if it squished ptes, bad * things might happen. @@ -431,7 +425,7 @@ void sun3_verify_hardware() } if (!cpu_match) mon_panic("kernel not configured for the Sun 3 model\n"); - mon_printf("kernel configured for Sun 3/%s\n", cpu_string); + mon_printf("configured for Sun 3/%s\n", cpu_string); } /* @@ -572,7 +566,6 @@ unsigned int get_interrupt_reg() void sun3_bootstrap() { - static char hello[] = "hello world"; int i; extern int cold, astpending; @@ -582,7 +575,6 @@ void sun3_bootstrap() */ cold = 1; - mon_printf("%s\n", hello); mon_printf("\nPROM Version: %x\n", romp->romvecVersion); sun3_monitor_hooks(); diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c index 5f690593a011..799ef464341b 100644 --- a/sys/arch/sun3/sun3/trap.c +++ b/sys/arch/sun3/sun3/trap.c @@ -51,15 +51,18 @@ #include #include #include +#include #ifdef KTRACE #include #endif +#include +#include +#include #include #include -#include #include -#include + #include #include @@ -585,7 +588,7 @@ syscall(code, frame) if (p->p_emul == EMUL_SUNOS) break; #endif - code = fuword(params + QUAD_LOWWORD * sizeof(int)); /* indir */ + code = fuword(params + _QUAD_LOWWORD*sizeof(int)); /* indir */ params += sizeof(quad_t); break; default: