ok?
Index: arch/hppa/hppa/db_disasm.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/db_disasm.c,v
retrieving revision 1.20
diff -u -p -r1.20 db_disasm.c
--- arch/hppa/hppa/db_disasm.c 15 Oct 2014 17:22:56 -0000 1.20
+++ arch/hppa/hppa/db_disasm.c 5 Nov 2019 12:22:33 -0000
@@ -2309,9 +2309,7 @@ fmpyaddDasm(i, ofs, w)
}
vaddr_t
-db_disasm(loc, flag)
- vaddr_t loc;
- boolean_t flag;
+db_disasm(vaddr_t loc, int flag)
{
register const struct inst *i;
register const struct majoropcode *m;
Index: arch/sparc64/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/include/db_machdep.h,v
retrieving revision 1.19
diff -u -p -r1.19 db_machdep.h
--- arch/sparc64/include/db_machdep.h 23 Mar 2019 05:47:23 -0000 1.19
+++ arch/sparc64/include/db_machdep.h 5 Nov 2019 12:23:07 -0000
@@ -107,11 +107,11 @@ extern db_regs_t ddb_regs; /* register s
*/
#define SOFTWARE_SSTEP
-boolean_t db_inst_trap_return(int inst);
-boolean_t db_inst_return(int inst);
-boolean_t db_inst_call(int inst);
-boolean_t db_inst_branch(int inst);
-boolean_t db_inst_unconditional_flow_transfer(int inst);
+int db_inst_trap_return(int inst);
+int db_inst_return(int inst);
+int db_inst_call(int inst);
+int db_inst_branch(int inst);
+int db_inst_unconditional_flow_transfer(int inst);
db_addr_t db_branch_taken(int inst, db_addr_t pc, db_regs_t *regs);
#define inst_trap_return(ins) db_inst_trap_return(ins)
Index: arch/sparc64/sparc64/db_disasm.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/db_disasm.c,v
retrieving revision 1.6
diff -u -p -r1.6 db_disasm.c
--- arch/sparc64/sparc64/db_disasm.c 15 Jan 2004 17:22:28 -0000 1.6
+++ arch/sparc64/sparc64/db_disasm.c 5 Nov 2019 12:23:33 -0000
@@ -874,9 +874,7 @@ struct sparc_insn sparc_i[] = {
};
db_addr_t
-db_disasm(loc, altfmt)
- vaddr_t loc;
- boolean_t altfmt;
+db_disasm(vaddr_t loc, int altfmt)
{
struct sparc_insn* i_ptr = (struct sparc_insn *)&sparc_i;
Index: arch/sparc64/sparc64/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/db_interface.c,v
retrieving revision 1.52
diff -u -p -r1.52 db_interface.c
--- arch/sparc64/sparc64/db_interface.c 2 Aug 2019 02:17:35 -0000 1.52
+++ arch/sparc64/sparc64/db_interface.c 5 Nov 2019 12:25:03 -0000
@@ -65,7 +65,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;
struct cpu_info *db_switch_to_cpu;
#endif
@@ -299,13 +299,13 @@ db_ktrap(type, tf)
s = splhigh();
db_active++;
- cnpollc(TRUE);
+ cnpollc(1);
/* Need to do spl stuff till cnpollc works */
tl = ddb_regs.ddb_tl = savetstate(ts);
db_dump_ts(0, 0, 0, 0);
db_trap(type, 0/*code*/);
restoretstate(tl,ts);
- cnpollc(FALSE);
+ cnpollc(0);
db_active--;
splx(s);
@@ -1269,9 +1269,8 @@ db_branch_taken(inst, pc, regs)
}
}
-boolean_t
-db_inst_branch(inst)
- int inst;
+int
+db_inst_branch(int inst)
{
union instr insn;
@@ -1280,13 +1279,13 @@ db_inst_branch(inst)
/* the fancy union just gets in the way of this: */
switch(inst & 0xffc00000) {
case 0x30400000: /* branch always, annul, with prediction */
- return TRUE;
+ return 1;
case 0x30800000: /* branch always, annul */
- return TRUE;
+ return 1;
}
if (insn.i_any.i_op != IOP_OP2)
- return FALSE;
+ return 0;
switch (insn.i_op2.i_op2) {
case IOP2_BPcc:
@@ -1295,17 +1294,16 @@ db_inst_branch(inst)
case IOP2_FBPfcc:
case IOP2_FBfcc:
case IOP2_CBccc:
- return TRUE;
+ return 1;
default:
- return FALSE;
+ return 0;
}
}
-boolean_t
-db_inst_call(inst)
- int inst;
+int
+db_inst_call(int inst)
{
union instr insn;
@@ -1313,30 +1311,29 @@ db_inst_call(inst)
switch (insn.i_any.i_op) {
case IOP_CALL:
- return TRUE;
+ return 1;
case IOP_reg:
return (insn.i_op3.i_op3 == IOP3_JMPL) && !db_inst_return(inst);
default:
- return FALSE;
+ return 0;
}
}
-boolean_t
-db_inst_unconditional_flow_transfer(inst)
- int inst;
+int
+db_inst_unconditional_flow_transfer(int inst)
{
union instr insn;
insn.i_int = inst;
if (db_inst_call(inst))
- return TRUE;
+ return 1;
if (insn.i_any.i_op != IOP_OP2)
- return FALSE;
+ return 0;
switch (insn.i_op2.i_op2)
{
@@ -1348,22 +1345,20 @@ db_inst_unconditional_flow_transfer(inst
return insn.i_branch.i_cond == Icc_A;
default:
- return FALSE;
+ return 0;
}
}
-boolean_t
-db_inst_return(inst)
- int inst;
+int
+db_inst_return(int inst)
{
return (inst == I_JMPLri(I_G0, I_O7, 8) || /* ret */
inst == I_JMPLri(I_G0, I_I7, 8)); /* retl */
}
-boolean_t
-db_inst_trap_return(inst)
- int inst;
+int
+db_inst_trap_return(int inst)
{
union instr insn;
Index: arch/sparc64/sparc64/db_trace.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/db_trace.c,v
retrieving revision 1.17
diff -u -p -r1.17 db_trace.c
--- arch/sparc64/sparc64/db_trace.c 1 Nov 2019 18:03:50 -0000 1.17
+++ arch/sparc64/sparc64/db_trace.c 5 Nov 2019 12:25:32 -0000
@@ -60,15 +60,15 @@ db_stack_trace_print(db_expr_t addr, int
char *modif, int (*pr)(const char *, ...))
{
vaddr_t frame;
- boolean_t kernel_only = TRUE;
- boolean_t trace_thread = FALSE;
+ int kernel_only = 1;
+ int trace_thread = 0;
char c, *cp = modif;
while ((c = *cp++) != 0) {
if (c == 't')
- trace_thread = TRUE;
+ trace_thread = 1;
if (c == 'u')
- kernel_only = FALSE;
+ kernel_only = 0;
}
if (!have_addr)
@@ -275,12 +275,12 @@ db_dump_stack(db_expr_t addr, int have_a
{
int i;
u_int64_t frame, oldframe;
- boolean_t kernel_only = TRUE;
+ int kernel_only = 1;
char c, *cp = modif;
while ((c = *cp++) != 0)
if (c == 'u')
- kernel_only = FALSE;
+ kernel_only = 0;
if (count == -1)
count = 65535;
