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

6 files changed, 22 insertions, 22 deletions

diff --git a/sys/arch/powerpc/ddb/db_disasm.c b/sys/arch/powerpc/ddb/db_disasm.c
index 44f2da3e74f..dd0ec057f6f 100644
--- a/sys/arch/powerpc/ddb/db_disasm.c
+++ b/sys/arch/powerpc/ddb/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.16 2014/04/26 06:17:26 jsg Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.17 2019/11/07 15:58:39 mpi Exp $	*/
 /*
  * Copyright (c) 1996, 2001, 2003 Dale Rahn. All rights reserved.
  *
@@ -1162,7 +1162,7 @@ dis_ppc(u_int32_t addr, const struct opcode *opcodeset, instr_t instr)
 }
 
 db_addr_t
-db_disasm(db_addr_t loc, boolean_t extended)
+db_disasm(db_addr_t loc, int extended)
 {
 	int class;
 	instr_t opcode;
diff --git a/sys/arch/powerpc/ddb/db_interface.c b/sys/arch/powerpc/ddb/db_interface.c
index 6352c84fceb..28b5ddf284d 100644
--- a/sys/arch/powerpc/ddb/db_interface.c
+++ b/sys/arch/powerpc/ddb/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.5 2019/03/23 05:47:23 visa Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.6 2019/11/07 15:58:39 mpi Exp $	*/
 /*      $NetBSD: db_interface.c,v 1.12 2001/07/22 11:29:46 wiz Exp $ */
 
 /*
@@ -46,7 +46,7 @@
 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
 
@@ -92,9 +92,9 @@ db_trap_glue(struct trapframe *frame)
 
 			s = splhigh();
 			db_active++;
-			cnpollc(TRUE);
+			cnpollc(1);
 			db_trap(T_BREAKPOINT, 0);
-			cnpollc(FALSE);
+			cnpollc(0);
 			db_active--;
 			splx(s);
 
diff --git a/sys/arch/sh/include/db_machdep.h b/sys/arch/sh/include/db_machdep.h
index 83900af2bf0..b561f6a685a 100644
--- a/sys/arch/sh/include/db_machdep.h
+++ b/sys/arch/sh/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.8 2016/04/27 11:10:48 mpi Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.9 2019/11/07 15:58:39 mpi Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.12 2006/05/10 06:24:03 skrll Exp $	*/
 
 /*
@@ -58,9 +58,9 @@ extern db_regs_t	ddb_regs;	/* register state */
 
 int db_ktrap(int, int, db_regs_t *);
 void db_machine_init (void);
-boolean_t inst_call(int);
-boolean_t inst_return(int);
-boolean_t inst_trap_return(int);
+int inst_call(int);
+int inst_return(int);
+int inst_trap_return(int);
 
 /*
  * We have machine-dependent commands.
diff --git a/sys/arch/sh/sh/db_disasm.c b/sys/arch/sh/sh/db_disasm.c
index 24950ba1240..00358b446df 100644
--- a/sys/arch/sh/sh/db_disasm.c
+++ b/sys/arch/sh/sh/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.4 2017/05/30 15:39:05 mpi Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.5 2019/11/07 15:58:39 mpi Exp $	*/
 /*	$NetBSD: db_disasm.c,v 1.13 2006/01/21 02:09:06 uwe Exp $	*/
 
 /*
@@ -131,7 +131,7 @@ static const rasm_t f[16][16] = {
 };
 
 db_addr_t
-db_disasm(db_addr_t loc, boolean_t altfmt)
+db_disasm(db_addr_t loc, int altfmt)
 {
 	char line[40], ascii[4];
 	void *pc = (void *)loc;
diff --git a/sys/arch/sh/sh/db_interface.c b/sys/arch/sh/sh/db_interface.c
index 423259dd046..8e3d9100e17 100644
--- a/sys/arch/sh/sh/db_interface.c
+++ b/sys/arch/sh/sh/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.11 2018/03/20 15:45:32 mpi Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.12 2019/11/07 15:58:39 mpi Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.37 2006/09/06 00:11:49 uwe Exp $	*/
 
 /*-
@@ -133,9 +133,9 @@ db_ktrap(int type, int code, db_regs_t *regs)
 
 	s = splhigh();
 	db_active++;
-	cnpollc(TRUE);
+	cnpollc(1);
 	db_trap(type, code);
-	cnpollc(FALSE);
+	cnpollc(0);
 	db_active--;
 	splx(s);
 
@@ -161,7 +161,7 @@ db_enter(void)
 #define	M_RTE	0xffff
 #define	I_RTE	0x002b
 
-boolean_t
+int
 inst_call(int inst)
 {
 #if _BYTE_ORDER == BIG_ENDIAN
@@ -171,7 +171,7 @@ inst_call(int inst)
 	       (inst & M_JSR) == I_JSR;
 }
 
-boolean_t
+int
 inst_return(int inst)
 {
 #if _BYTE_ORDER == BIG_ENDIAN
@@ -180,7 +180,7 @@ inst_return(int inst)
 	return (inst & M_RTS) == I_RTS;
 }
 
-boolean_t
+int
 inst_trap_return(int inst)
 {
 #if _BYTE_ORDER == BIG_ENDIAN
diff --git a/sys/arch/sh/sh/db_trace.c b/sys/arch/sh/sh/db_trace.c
index 10339844473..b87ba1cfd00 100644
--- a/sys/arch/sh/sh/db_trace.c
+++ b/sys/arch/sh/sh/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.8 2017/11/03 11:29:46 jasper Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.9 2019/11/07 15:58:39 mpi Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.19 2006/01/21 22:10:59 uwe Exp $	*/
 
 /*-
@@ -167,7 +167,7 @@ db_nextframe(
 		goto out;
 
 	for (i = 0; i < 30; i++) {
-		inst = db_get_value(pc, 2, FALSE);
+		inst = db_get_value(pc, 2, 0);
 		pc += 2;
 
 		if (inst == 0x6ef3)	/* mov r15,r14 -- end of prologue */
@@ -199,13 +199,13 @@ db_nextframe(
 			continue;
 		}
 		if ((inst & 0xf000) == 0x9000) {
-			if (db_get_value(pc, 2, FALSE) == 0x3f38) {
+			if (db_get_value(pc, 2, 0) == 0x3f38) {
 				/* "mov #n,r3; sub r3,r15" */
 				unsigned int disp = (int)(inst & 0xff);
 				int r3;
 
 				r3 = db_get_value(pc + 4 - 2 + (disp << 1),
-				    2, FALSE);
+				    2, 0);
 				if ((r3 & 0x00008000) == 0)
 					r3 &= 0x0000ffff;
 				else