Substitute boolean_t/TRUE/FALSE by int/1/0.

ok dlg@, jasper@

6 files changed, 24 insertions, 24 deletions

diff --git a/sys/arch/arm64/arm64/db_disasm.c b/sys/arch/arm64/arm64/db_disasm.c
index a27762d3098..920d6f427a5 100644
--- a/sys/arch/arm64/arm64/db_disasm.c
+++ b/sys/arch/arm64/arm64/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.1 2016/12/17 23:38:33 patrick Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.2 2019/11/07 11:04:21 mpi Exp $ */
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
  *
@@ -23,7 +23,7 @@
 #include <ddb/db_access.h>
 
 vaddr_t
-db_disasm(vaddr_t loc, boolean_t altfmt)
+db_disasm(vaddr_t loc, int altfmt)
 {
 	return loc + 4;
 }
diff --git a/sys/arch/arm64/arm64/db_interface.c b/sys/arch/arm64/arm64/db_interface.c
index 4aae8aa585a..e4068fec93e 100644
--- a/sys/arch/arm64/arm64/db_interface.c
+++ b/sys/arch/arm64/arm64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.6 2019/03/23 05:47:22 visa Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.7 2019/11/07 11:04:21 mpi Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $	*/
 
 /*
@@ -105,7 +105,7 @@ struct db_variable db_regs[] = {
 struct db_mutex ddb_mp_mutex = DB_MUTEX_INITIALIZER;
 volatile int ddb_state = DDB_STATE_NOT_RUNNING;
 volatile cpuid_t ddb_active_cpu;
-boolean_t        db_switch_cpu;
+int		 db_switch_cpu;
 long             db_switch_to_cpu;
 
 void db_cpuinfo_cmd(db_expr_t, int, db_expr_t, char *);
@@ -156,9 +156,9 @@ kdb_trap(int type, db_regs_t *regs)
 
 	s = splhigh();
 	db_active++;
-	cnpollc(TRUE);
+	cnpollc(1);
 	db_trap(type, 0/*code*/);
-	cnpollc(FALSE);
+	cnpollc(0);
 	db_active--;
 	splx(s);
 
diff --git a/sys/arch/arm64/arm64/db_trace.c b/sys/arch/arm64/arm64/db_trace.c
index f9af3f981de..2b94a443e8d 100644
--- a/sys/arch/arm64/arm64/db_trace.c
+++ b/sys/arch/arm64/arm64/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.6 2018/05/04 15:43:34 visa Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.7 2019/11/07 11:04:21 mpi Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.8 2003/01/17 22:28:48 thorpej Exp $	*/
 
 /*
@@ -68,15 +68,15 @@ db_stack_trace_print(db_expr_t addr, int have_addr, db_expr_t count,
 	db_expr_t	offset;
 	Elf_Sym *	sym;
 	char		*name;
-	boolean_t	kernel_only = TRUE;
-	boolean_t	trace_thread = FALSE;
+	int		kernel_only = 1;
+	int		trace_thread = 0;
 	//db_addr_t	scp = 0;
 
 	while ((c = *cp++) != 0) {
 		if (c == 'u')
-			kernel_only = FALSE;
+			kernel_only = 0;
 		if (c == 't')
-			trace_thread = TRUE;
+			trace_thread = 1;
 	}
 
 	if (!have_addr) {
diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h
index fc40211ad82..1b8f0a72144 100644
--- a/sys/arch/mips64/include/db_machdep.h
+++ b/sys/arch/mips64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.18 2019/03/23 05:47:23 visa Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.19 2019/11/07 11:04:21 mpi Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -43,7 +43,7 @@ typedef vaddr_t		db_addr_t;
 
 #define	SOFTWARE_SSTEP		/* Need software single step */
 #define	SOFTWARE_SSTEP_EMUL	/* next_instr_address() emulates 100% */
-db_addr_t	next_instr_address(db_addr_t, boolean_t);
+db_addr_t	next_instr_address(db_addr_t, int);
 #define	BKPT_SIZE   (4)
 #define	BKPT_SET(ins)	(BREAK_DDB)
 #define	DB_VALID_BREAKPOINT(addr)	(((addr) & 3) == 0)
diff --git a/sys/arch/mips64/mips64/db_disasm.c b/sys/arch/mips64/mips64/db_disasm.c
index e3852cd508a..22b5ab4f075 100644
--- a/sys/arch/mips64/mips64/db_disasm.c
+++ b/sys/arch/mips64/mips64/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.17 2015/09/23 17:03:27 miod Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.18 2019/11/07 11:04:21 mpi Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -51,7 +51,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)kadb.c	8.1 (Berkeley) 6/10/93
- *      $Id: db_disasm.c,v 1.17 2015/09/23 17:03:27 miod Exp $
+ *      $Id: db_disasm.c,v 1.18 2019/11/07 11:04:21 mpi Exp $
  */
 
 #ifdef _KERNEL
@@ -1016,7 +1016,7 @@ loadstore:
 
 #ifdef _KERNEL
 db_addr_t
-db_disasm(db_addr_t loc, boolean_t altfmt)
+db_disasm(db_addr_t loc, int altfmt)
 {
 	extern uint32_t kdbpeek(vaddr_t);
 
diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c
index 7709c94a154..c316e9d6952 100644
--- a/sys/arch/mips64/mips64/db_machdep.c
+++ b/sys/arch/mips64/mips64/db_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.c,v 1.53 2019/09/02 02:35:33 deraadt Exp $ */
+/*	$OpenBSD: db_machdep.c,v 1.54 2019/11/07 11:04:21 mpi Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -72,7 +72,7 @@ void db_dump_tlb_cmd(db_expr_t, int, db_expr_t, char *);
 struct db_mutex ddb_mp_mutex = DB_MUTEX_INITIALIZER;
 volatile int ddb_state = DDB_STATE_NOT_RUNNING;
 volatile cpuid_t ddb_active_cpu;
-boolean_t        db_switch_cpu;
+int		 db_switch_cpu;
 long             db_switch_to_cpu;
 #endif
 
@@ -133,7 +133,7 @@ db_ktrap(int type, struct trapframe *fp)
 {
 	switch(type) {
 	case T_BREAK:		/* breakpoint */
-		if (db_get_value((fp)->pc, sizeof(int), FALSE) == BREAK_SOVER) {
+		if (db_get_value((fp)->pc, sizeof(int), 0) == BREAK_SOVER) {
 			(fp)->pc += BKPT_SIZE;
 		}
 		break;
@@ -162,9 +162,9 @@ db_ktrap(int type, struct trapframe *fp)
 		bcopy((void *)fp, (void *)&ddb_regs, NUMSAVEREGS * sizeof(register_t));
 
 		db_active++;
-		cnpollc(TRUE);
+		cnpollc(1);
 		db_trap(type, 0);
-		cnpollc(FALSE);
+		cnpollc(0);
 		db_active--;
 
 		bcopy((void *)&ddb_regs, (void *)fp, NUMSAVEREGS * sizeof(register_t));
@@ -173,7 +173,7 @@ db_ktrap(int type, struct trapframe *fp)
 			ddb_state = DDB_STATE_EXITING;
 	}
 #endif
-	return(TRUE);
+	return 1;
 }
 
 #ifdef MULTIPROCESSOR
@@ -332,7 +332,7 @@ db_write_bytes(vaddr_t addr, size_t size, char *data)
 }
 
 void
-db_stack_trace_print(db_expr_t addr, boolean_t have_addr, db_expr_t count,
+db_stack_trace_print(db_expr_t addr, int have_addr, db_expr_t count,
     char *modif, int (*pr)(const char *, ...))
 {
 	struct trapframe *regs = &ddb_regs;
@@ -354,7 +354,7 @@ db_stack_trace_print(db_expr_t addr, boolean_t have_addr, db_expr_t count,
  *	required.
  */
 db_addr_t
-next_instr_address(db_addr_t pc, boolean_t bd)
+next_instr_address(db_addr_t pc, int bd)
 {
 	db_addr_t next;
 	uint32_t instr;