backout previous kprintf change

This commit is contained in:
christos 1996-10-13 16:50:51 +00:00
parent 65e53018c2
commit ad67e04154
17 changed files with 70 additions and 70 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.65 1996/10/12 17:34:52 mhitch Exp $ */
/* $NetBSD: locore.s,v 1.66 1996/10/13 16:50:51 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -814,7 +814,7 @@ Laststkadj:
Ldorte:
| moveml a0/a1/d0/d1,sp@-
| pea pc@(Ldoinrte)
| jsr _kprintf
| jsr _printf
| addql #4,sp
| moveml sp@+,a0/a1/d0/d1
rte | real return

View File

@ -1,4 +1,4 @@
/* $NetBSD: bcopyinout.S,v 1.6 1996/10/11 00:06:31 christos Exp $ */
/* $NetBSD: bcopyinout.S,v 1.7 1996/10/13 16:52:00 christos Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@ -175,7 +175,7 @@ copyinoutpcbfault:
mov r2, r3
ldr r3, Lcurproc
ldr r3, [r3]
bl _kprintf
bl _printf
mov r0, #EFAULT
ldmfd sp!, {lr}
ldmfd sp!, {r4}

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuswitch.S,v 1.10 1996/10/11 00:06:33 christos Exp $ */
/* $NetBSD: cpuswitch.S,v 1.11 1996/10/13 16:52:01 christos Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -169,7 +169,7 @@ Lsetrunqueue_erg:
mov r2, r1
mov r1, r0
add r0, pc, #Ltext1 - . - 8
bl _kprintf
bl _printf
ldr r2, Lqs
ldr r1, [r2]

View File

@ -1,4 +1,4 @@
/* $NetBSD: irq.S,v 1.7 1996/10/11 00:06:42 christos Exp $ */
/* $NetBSD: irq.S,v 1.8 1996/10/13 16:52:02 christos Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -306,7 +306,7 @@ _irqast:
stmfd sp!, {r0-r3, lr}
add r0, pc, #Lirqtext0 - . - 8
bl _kprintf
bl _printf
ldmfd sp!, {r0-r3, lr}
Lis:
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.11 1996/10/11 00:06:47 christos Exp $ */
/* $NetBSD: locore.S,v 1.12 1996/10/13 16:52:02 christos Exp $ */
/*
* Copyright (C) 1994 Mark Brinicombe
@ -98,7 +98,7 @@ L1:
/* mov r1, sp
add r0, pc, #(Ltext9 - . - 8)
bl _kprintf
bl _printf
*/
/* Setup an initial trap frame for start_init to use */
@ -116,7 +116,7 @@ stmfd r13!, {r0-r3}
ldr r2, [r1]
/* mov r1, r0*/
add r0, pc, #(Ltext7 - . - 8)
bl _kprintf
bl _printf
ldmfd r13!, {r0-r3}
#endif
@ -281,7 +281,7 @@ addrexc:
.word 0xe14f2000
mov r3, lr
add r0, pc, #addrexcmsg - . - 8
bl _kprintf
bl _printf
b data_abort_entry
addrexcmsg:
@ -353,12 +353,12 @@ tbloop:
ldr r2, [r4, #-12]
ldr r3, [r4, #-8]
add r0, pc, #Ltb1 - . - 8
bl _kprintf
bl _printf
/* ldr r1, [r4, #-4]
ldr r2, [r4]
add r0, pc, #Ltb2 - . - 8
bl _kprintf*/
bl _printf*/
ldr r0, [r4, #-4]
ldr r1, [r4]
bl _traceback_sym
@ -406,7 +406,7 @@ stbloop:
/* ldr r1, [r4, #-4]
ldr r2, [r4]
add r0, pc, #Ltb2 - . - 8
bl _kprintf*/
bl _printf*/
ldr r0, [r4, #-4]
ldr r1, [r4]
bl _traceback_sym
@ -442,12 +442,12 @@ itbloop:
ldr r2, [r4, #-12]
ldr r3, [r4, #-8]
add r0, pc, #Ltb1 - . - 8
bl _kprintf
bl _printf
/* ldr r1, [r4, #-4]
ldr r2, [r4]
add r0, pc, #Ltb2 - . - 8
bl _kprintf*/
bl _printf*/
ldr r0, [r4, #-4]
ldr r1, [r4]
bl _traceback_sym
@ -481,12 +481,12 @@ usertbloop:
ldr r2, [r4, #-12]
ldr r3, [r4, #-8]
add r0, pc, #Lusertb1 - . - 8
bl _kprintf
bl _printf
ldr r1, [r4, #-4]
ldr r2, [r4]
add r0, pc, #Lusertb2 - . - 8
bl _kprintf
bl _printf
mov r3, r4
ldr r4, [r4, #-12]

View File

@ -1,4 +1,4 @@
/* $NetBSD: scratch.S,v 1.4 1996/10/11 00:06:54 christos Exp $ */
/* $NetBSD: scratch.S,v 1.5 1996/10/13 16:52:03 christos Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@ -85,7 +85,7 @@ ReadWordPCBFault:
mov r2, r0
add r0, pc, #ReadWordText1 - . - 8
mov r1, r2
bl _kprintf
bl _printf
mov r0, #0x00000001
ldmfd sp!, {lr}
mov pc, lr
@ -186,7 +186,7 @@ fusupcbfault:
mov r2, r0
add r0, pc, #ReadWordText1 - . - 8
mov r1, r2
bl _kprintf
bl _printf
mvn r0, #0x00000000
ldmfd sp!, {lr}
mov pc, lr

View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd_irq.S,v 1.7 1996/10/11 00:06:42 christos Exp $ */
/* $NetBSD: iomd_irq.S,v 1.8 1996/10/13 16:52:02 christos Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -306,7 +306,7 @@ _irqast:
stmfd sp!, {r0-r3, lr}
add r0, pc, #Lirqtext0 - . - 8
bl _kprintf
bl _printf
ldmfd sp!, {r0-r3, lr}
Lis:
#endif

View File

@ -1,4 +1,4 @@
$NetBSD: Options,v 1.4 1996/10/11 00:11:00 christos Exp $
$NetBSD: Options,v 1.5 1996/10/13 16:52:40 christos Exp $
Here is a list of hp300 specific kernel compilation options and what they
mean:
@ -63,7 +63,7 @@ PANICBUTTON
works if HIL (level 1) interrupts are not masked.
DEBUG
Compiles in a variety of consistency checks and debug kprintfs
Compiles in a variety of consistency checks and debug printfs
throughout the hp300 MD code and device drivers.
COMPAT_HPUX

View File

@ -1,4 +1,4 @@
/* $NetBSD: in_cksum.s,v 1.5 1996/10/11 00:26:39 christos Exp $ */
/* $NetBSD: in_cksum.s,v 1.6 1996/10/13 16:53:31 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@ -279,7 +279,7 @@ return:
out_of_mbufs:
pushl $1f
call _kprintf
call _printf
leal 4(%esp), %esp
jmp return
1:

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.153 1996/10/11 00:26:43 christos Exp $ */
/* $NetBSD: locore.s,v 1.154 1996/10/13 16:53:29 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@ -1964,7 +1964,7 @@ calltrap:
INTRFASTEXIT
3: sti
pushl $4f
call _kprintf
call _printf
addl $4,%esp
#ifdef DDB
int $3
@ -2031,7 +2031,7 @@ syscall1:
INTRFASTEXIT
3: sti
pushl $4f
call _kprintf
call _printf
addl $4,%esp
#ifdef DDB
int $3

View File

@ -1,4 +1,4 @@
/* $NetBSD: adbsysasm.s,v 1.3 1996/10/11 00:24:39 christos Exp $ */
/* $NetBSD: adbsysasm.s,v 1.4 1996/10/13 16:54:24 christos Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@ -59,7 +59,7 @@ _adb_jadbproc:
#if defined(MRG_DEBUG) && 0
moveml #0xc0c0, sp@- | save scratch regs
movl _adb_jadbprochello, sp@-
jbsr _kprintf
jbsr _printf
addl #4, sp /* pop params */
moveml sp@+, #0x0303 | restore scratch regs
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: macromasm.s,v 1.12 1996/10/11 00:25:17 christos Exp $ */
/* $NetBSD: macromasm.s,v 1.13 1996/10/13 16:55:24 christos Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@ -119,7 +119,7 @@
.text
.even
.global _panic
.global _kprintf
.global _printf
/*
* Most of the following glue just takes C function calls, converts
@ -455,7 +455,7 @@ Laltoolbox:
movml #0xC0C0, sp@- | better save
pea LalP1
jbsr _printf
| kprintf ("Toolbox trap\n");
| printf ("Toolbox trap\n");
lea sp@(4), sp | pop
movml sp@+, #0x0303 | restore
#endif
@ -467,7 +467,7 @@ Laltoolbox:
clrw sp@- | coerce to int
pea LalP2
jbsr _printf
| kprintf ("Status register 0x%x\n", sr);
| printf ("Status register 0x%x\n", sr);
lea sp@(8), sp | pop
movml sp@+, #0x0303 | restore
#endif
@ -482,7 +482,7 @@ Lalnoauto:
movl a1, sp@-
pea LalP4
jbsr _printf
| kprintf ("return address is 0x%x\n", new pc);
| printf ("return address is 0x%x\n", new pc);
lea sp@(8), sp | pop
movml sp@+, #0x0303 | restore
#endif
@ -494,7 +494,7 @@ Lalnoauto:
movl d0, sp@-
pea LalP5
jbsr _printf
| kprintf ("trap number is 0x%x\n", trapnum);
| printf ("trap number is 0x%x\n", trapnum);
lea sp@(8), sp | pop
movml sp@+, #0x0303 | restore
#endif
@ -514,7 +514,7 @@ Laltbok:
movl a0, sp@-
pea LalP6
jbsr _printf
| kprintf ("trap address is 0x%x\n", trapaddr);
| printf ("trap address is 0x%x\n", trapaddr);
lea sp@(8), sp | pop
movml sp@+, #0x0303 | restore
#endif
@ -569,7 +569,7 @@ _mrg_tracetrap:
movml #0xc0c0, sp@-
movl d0, sp@-
pea Ltraceprint
jbsr _printf | kprintf("PC is %x\n", pc);
jbsr _printf | printf("PC is %x\n", pc);
addql #8, sp
movml sp@+,#0x0303
tstl d0
@ -590,7 +590,7 @@ LPCiszero:
movl sp@+, d0 | restore d0
movml #0xc0c0, sp@-
pea LtracePCzero
jbsr _panic | kprintf("PC is zero!", pc);
jbsr _panic | panic("PC is zero!", pc);
addql #4, sp
movml sp@+,#0x0303

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.4 1996/10/10 23:45:28 christos Exp $ */
/* $NetBSD: locore.S,v 1.5 1996/10/13 16:57:03 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@ -2146,7 +2146,7 @@ NLEAF(MachTLBMissException)
sw a3, 20(sp)
sw sp, 24(sp)
move a2, ra
jal _C_LABEL(kprintf)
jal _C_LABEL(printf)
mfc0 a3, MACH_COP_0_BAD_VADDR
.data
1:
@ -3000,7 +3000,7 @@ sys_stk_chk:
sw a2, 16(sp)
sw a3, 20(sp)
move a2, ra
jal kprintf
jal printf
dmfc0 a3, MACH_COP_0_BAD_VADDR
.data
1:

View File

@ -1,4 +1,4 @@
/* $NetBSD: pm_ds.c,v 1.1 1996/10/12 23:33:18 jonathan Exp $ */
/* $NetBSD: pm_ds.c,v 1.2 1996/10/13 16:59:14 christos Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -122,7 +122,7 @@ pm_ds_attach(parent, self, aux)
/* no interrupts for PM */
/*BUS_INTR_ESTABLISH(ca, sccintr, self->dv_unit);*/
kprintf("\n");
printf("\n");
return;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: sii_ds.c,v 1.1 1996/10/13 03:02:40 jonathan Exp $ */
/* $NetBSD: sii_ds.c,v 1.2 1996/10/13 16:59:15 christos Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -65,7 +65,7 @@ sii_ds_match(parent, match, aux)
/* XXX check for bad address, untested */
siiaddr = (void *)ca->ca_addr;
if (siiaddr != (void *)MACH_PHYS_TO_UNCACHED(KN01_SYS_SII)) {
kprintf("(siimatch: bad addr %x, substituting %x\n",
printf("(siimatch: bad addr %x, substituting %x\n",
ca->ca_addr, MACH_PHYS_TO_UNCACHED(KN01_SYS_SII));
siiaddr = (void *)MACH_PHYS_TO_UNCACHED(KN01_SYS_SII);
}
@ -92,5 +92,5 @@ siiattach(sc);
/* tie pseudo-slot to device */
BUS_INTR_ESTABLISH(ca, siiintr, sc);
kprintf("\n");
printf("\n");
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_debug.c,v 1.12 1996/10/13 02:03:08 christos Exp $ */
/* $NetBSD: tcp_debug.c,v 1.13 1996/10/13 17:31:23 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -138,7 +138,7 @@ tcp_trace(act, ostate, tp, ti, req)
#define pf(f) { if (ti->ti_flags&TH_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
pf(SYN); pf(ACK); pf(FIN); pf(RST); pf(PUSH); pf(URG);
#endif
kprintf(">");
printf(">");
}
break;

View File

@ -1,4 +1,4 @@
/* $NetBSD: tp.trans,v 1.5 1996/10/10 23:22:05 christos Exp $ */
/* $NetBSD: tp.trans,v 1.6 1996/10/13 17:32:04 christos Exp $ */
/* NEW */
/*-
@ -257,7 +257,7 @@ SAME <== TP_REFWAIT [ CR_TPDU, CC_TPDU, DT_TPDU,
{
# ifdef TP_DEBUG
if( $E.ev_number != AK_TPDU )
kprintf("TPDU 0x%x in REFWAIT!!!!\n", $E.ev_number);
printf("TPDU 0x%x in REFWAIT!!!!\n", $E.ev_number);
# endif TP_DEBUG
}
;
@ -344,7 +344,7 @@ TP_CONFIRMING <== TP_LISTENING CR_TPDU
tptrace(TPPTmisc, "CR datalen data", $$.e_datalen, $$.e_data,0,0);
ENDTRACE
IFDEBUG(D_CONN)
kprintf("CR datalen 0x%x data 0x%x", $$.e_datalen, $$.e_data);
printf("CR datalen 0x%x data 0x%x", $$.e_datalen, $$.e_data);
ENDDEBUG
$P.tp_refstate = REF_OPEN; /* has timers */
$P.tp_fcredit = $$.e_cdt;
@ -366,7 +366,7 @@ TP_OPEN <== TP_CONFIRMING T_ACPT_req
tptrace(TPPTmisc, "Confiming", $P, 0,0,0);
ENDTRACE
IFDEBUG(D_CONN)
kprintf("Confirming connection: $P" );
printf("Confirming connection: $P" );
ENDDEBUG
soisconnected($P.tp_sock);
(void) tp_emit(CC_TPDU_type, $P, 0,0, MNULL) ;
@ -382,7 +382,7 @@ TP_AKWAIT <== TP_CONFIRMING T_ACPT_req
tptrace(TPPTmisc, "Confiming", $P, 0,0,0);
ENDTRACE
IFDEBUG(D_CONN)
kprintf("Confirming connection: $P" );
printf("Confirming connection: $P" );
ENDDEBUG
tp_getoptions($P);
soisconnecting($P.tp_sock);
@ -398,7 +398,7 @@ TP_CLOSED <== TP_CONFIRMING T_ACPT_req
DEFAULT /* emit failed */
{
IFDEBUG(D_CONN)
kprintf("event: CR_TPDU emit CC failed done " );
printf("event: CR_TPDU emit CC failed done " );
ENDDEBUG
soisdisconnected($P.tp_sock);
tp_recycle_tsuffix($P);
@ -421,7 +421,7 @@ TP_CRSENT <== TP_CLOSED T_CONN_req
data = MCPY($P.tp_ucddata, M_WAIT);
if (data) {
IFDEBUG(D_CONN)
kprintf("T_CONN_req.trans m_copy cc 0x%x\n",
printf("T_CONN_req.trans m_copy cc 0x%x\n",
$P.tp_ucddata);
dump_mbuf(data, "sosnd @ T_CONN_req");
ENDDEBUG
@ -573,7 +573,7 @@ TP_OPEN <== TP_CRSENT CC_TPDU
DEFAULT
{
IFDEBUG(D_CONN)
kprintf("trans: CC_TPDU in CRSENT state flags 0x%x\n",
printf("trans: CC_TPDU in CRSENT state flags 0x%x\n",
(int)$P.tp_flags);
ENDDEBUG
IncStat(ts_tp4_conn);
@ -585,7 +585,7 @@ TP_OPEN <== TP_CRSENT CC_TPDU
tp_cuntimeout($P, TM_retrans);
if ($P.tp_ucddata) {
IFDEBUG(D_CONN)
kprintf("dropping user connect data cc 0x%x\n",
printf("dropping user connect data cc 0x%x\n",
$P.tp_ucddata->m_len);
ENDDEBUG
m_freem($P.tp_ucddata);
@ -684,7 +684,7 @@ TP_OPEN <== TP_AKWAIT DT_TPDU
doack = tp_stash($P, $E);
IFDEBUG(D_DATA)
kprintf("tp_stash returns %d\n",doack);
printf("tp_stash returns %d\n",doack);
ENDDEBUG
if (doack) {
@ -694,7 +694,7 @@ TP_OPEN <== TP_AKWAIT DT_TPDU
tp_ctimeout( $P, TM_sendack, (int)$P.tp_sendack_ticks);
IFDEBUG(D_DATA)
kprintf("after stash calling sbwakeup\n");
printf("after stash calling sbwakeup\n");
ENDDEBUG
}
;
@ -706,7 +706,7 @@ SAME <== TP_OPEN DT_TPDU
sbwakeup( &$P.tp_sock->so_rcv );
IFDEBUG(D_DATA)
kprintf("after stash calling sbwakeup\n");
printf("after stash calling sbwakeup\n");
ENDDEBUG
}
;
@ -723,7 +723,7 @@ SAME <== TP_OPEN DT_TPDU
doack = tp_stash($P, $E);
IFDEBUG(D_DATA)
kprintf("tp_stash returns %d\n",doack);
printf("tp_stash returns %d\n",doack);
ENDDEBUG
if(doack)
@ -732,7 +732,7 @@ SAME <== TP_OPEN DT_TPDU
tp_ctimeout_MIN( $P, TM_sendack, (int)$P.tp_sendack_ticks);
IFDEBUG(D_DATA)
kprintf("after stash calling sbwakeup\n");
printf("after stash calling sbwakeup\n");
ENDDEBUG
}
;
@ -942,7 +942,7 @@ TP_CLOSING <== [ TP_AKWAIT, TP_OPEN, TP_CRSENT, TP_CONFIRMING ] T_DISC_req
}
if (data) {
IFDEBUG(D_CONN)
kprintf("T_DISC_req.trans tp_ucddata 0x%x\n",
printf("T_DISC_req.trans tp_ucddata 0x%x\n",
$P.tp_ucddata);
dump_mbuf(data, "ucddata @ T_DISC_req");
ENDDEBUG
@ -1131,7 +1131,7 @@ SAME <== TP_OPEN T_XPD_req
$P.tp_snduna);
ENDTRACE
IFDEBUG(D_XPD)
kprintf("T_XPD_req: sb_cc 0x%x\n", $P.tp_Xsnd.sb_cc);
printf("T_XPD_req: sb_cc 0x%x\n", $P.tp_Xsnd.sb_cc);
dump_mbuf(m, "XPD req emitting M");
ENDDEBUG
error =
@ -1158,14 +1158,14 @@ SAME <== TP_OPEN AK_TPDU
struct sockbuf *sb = &$P.tp_sock->so_snd;
IFDEBUG(D_ACKRECV)
kprintf("GOOD ACK seq 0x%x cdt 0x%x\n", $$.e_seq, $$.e_cdt);
printf("GOOD ACK seq 0x%x cdt 0x%x\n", $$.e_seq, $$.e_cdt);
ENDDEBUG
if( $P.tp_class != TP_CLASS_0) {
tp_ctimeout($P, TM_inact, (int)$P.tp_inact_ticks);
}
sbwakeup(sb);
IFDEBUG(D_ACKRECV)
kprintf("GOOD ACK new sndnxt 0x%x\n", $P.tp_sndnxt);
printf("GOOD ACK new sndnxt 0x%x\n", $P.tp_sndnxt);
ENDDEBUG
}
;