Subject: Re: Problems with latest SUP
To: None <amiga@NetBSD.ORG>
From: None <is@Beverly.Rhein.DE>
List: amiga
Date: 05/12/1996 14:32:45
David Jones (dej@achilles.net) wrote:
: Problems with the latest sources:

: Comment out reference to 060sp in Makefile.amiga, at least until the 060sp
: shows up in the respository.

Yes. I'll do that later today. Sorry for the inconvenience. 
(The story is, I somehow remembered "in my head" that the 060SP
 copyright & license would be ok. When I checked 5 minutes before the
 commit I intended, I discovered that in the original archive there was
 no copyright/usage note/license/whatever; so I started frantically to
 fetch original archives of this from several places, didn't get
 different results, and finally postponed the commit 'til this has been 
 clarified by Motorola. Over all this hassle I simply forgot to change the
 Makefile back to reflect this.)


: trap.c: remove a use of mmudebug that was not properly #ifdef'ed DEBUG
: - I reported this once before.  Something needs to be done to check
:   the use if #ifdefs if source maintainers insist on compiling with
:   DEBUG.
: Patch:
: 
: *** trap.c.old	Sat May 11 14:19:32 1996
: --- trap.c	Sat May 11 08:04:21 1996
: ***************
: *** 1,4 ****
: ! /*	$NetBSD: trap.c,v 1.46 1996/05/09 20:30:51 is Exp $	*/
:   
:   /*
:    * Copyright (c) 1988 University of Utah.
: --- 1,4 ----
: ! /*	$NetBSD: trap.c,v 1.47 1996/05/10 14:31:08 is Exp $	*/
:   
:   /*
:    * Copyright (c) 1988 University of Utah.
: ***************
: *** 280,288 ****
:   	struct proc *p;
:   	u_quad_t sticks;
:   {
:   	static u_int oldcode=0, oldv=0;
:   	static struct proc *oldp=0;
: ! 
:   	extern vm_map_t kernel_map;
:   	struct vmspace *vm = NULL;
:   	vm_prot_t ftype;
: --- 280,289 ----
:   	struct proc *p;
:   	u_quad_t sticks;
:   {
: + #if defined(DEBUG) && defined(M68060)
:   	static u_int oldcode=0, oldv=0;
:   	static struct proc *oldp=0;
: ! #endif
:   	extern vm_map_t kernel_map;
:   	struct vmspace *vm = NULL;
:   	vm_prot_t ftype;

This one was already committed few hours later, it just was too late for
the sup.


: ***************
: *** 547,557 ****
:   			return;
:   	}
:   #endif
:   	if (mmudebug & 2)
:   	printf("trap: t %x c %x v %x pad %x adj %x sr %x pc %x fmt %x vc %x\n",
:   	    type, code, v, frame.f_pad, frame.f_stackadj, frame.f_sr,
:   	    frame.f_pc, frame.f_format, frame.f_vector);
: ! 
:   	switch (type) {
:   	default:
:   		panictrap(type, code, v, &frame);
: --- 548,559 ----
:   			return;
:   	}
:   #endif
: + #ifdef DEBUG
:   	if (mmudebug & 2)
:   	printf("trap: t %x c %x v %x pad %x adj %x sr %x pc %x fmt %x vc %x\n",
:   	    type, code, v, frame.f_pad, frame.f_stackadj, frame.f_sr,
:   	    frame.f_pc, frame.f_format, frame.f_vector);
: ! #endif
:   	switch (type) {
:   	default:
:   		panictrap(type, code, v, &frame);

This is in, too.