Remove ddb single-step load and store counters. Most platforms do not

implement them, and they are of questionable usefulness.

3 files changed, 4 insertions, 36 deletions

diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index ad399cc0bca..911621aaf31 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.16 2004/01/22 17:47:01 miod Exp $ */
+/* $OpenBSD: db_interface.c,v 1.17 2010/11/27 19:57:23 miod Exp $ */
 /* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */
 
 /* 
@@ -407,35 +407,6 @@ db_inst_load(ins)
 	return (FALSE);
 }
 
-boolean_t
-db_inst_store(ins)
-	int ins;
-{
-	alpha_instruction insn;
-
-	insn.bits = ins;
-
-	/* Stores. */
-	if (insn.mem_format.opcode == op_stw ||
-	    insn.mem_format.opcode == op_stb ||
-	    insn.mem_format.opcode == op_stq_u)
-		return (TRUE);
-	if ((insn.mem_format.opcode >= op_stf) &&
-	    (insn.mem_format.opcode <= op_stt))
-		return (TRUE);
-	if ((insn.mem_format.opcode >= op_stl) &&
-	    (insn.mem_format.opcode <= op_stq_c))
-		return (TRUE);
-
-	/* Barriers. */
-	if (insn.mem_format.opcode == op_special) {
-		if (insn.mem_format.displacement == op_mb)
-			return (TRUE);
-	}
-
-	return (FALSE);
-}
-
 db_addr_t
 db_branch_taken(ins, pc, regs)
 	int ins;
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index f18a503e4f0..767485158ab 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.14 2003/10/18 20:14:40 jmc Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.15 2010/11/27 19:57:23 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -247,7 +247,7 @@ trapframe:
 				 * XXX In here we might special case a frame
 				 * pointer setup, i.e. mov sp, fp.
 				 */
-			} else if (inst_load(inst))
+			} else if (db_inst_load(inst))
 				/* clobbers a register */
 				slot[rega(inst)] = 0;
 			else if (opcode[inst >> 26].opc_fmt == OPC_OP)
diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 14b512a0a64..1d2c3e575f0 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.19 2005/12/17 07:31:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.20 2010/11/27 19:57:23 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -83,7 +83,6 @@ boolean_t db_inst_branch(int);
 boolean_t db_inst_call(int);
 boolean_t db_inst_load(int);
 boolean_t db_inst_return(int);
-boolean_t db_inst_store(int);
 boolean_t db_inst_trap_return(int);
 boolean_t db_inst_unconditional_flow_transfer(int);
 u_long	db_register_value(db_regs_t *, int);
@@ -98,8 +97,6 @@ db_addr_t next_instr_address(db_addr_t, int);
 #define branch_taken(ins, pc, fun, regs) db_branch_taken((ins), (pc), (regs))
 #define inst_branch db_inst_branch
 #define inst_call db_inst_call
-#define inst_load db_inst_load
-#define inst_store db_inst_store
 #endif
 
 #endif	/* _ALPHA_DB_MACHDEP_H_ */