One ddb to rule them all.

Move the ddb files form macppc/macppc to powerpc/ddb, so that mvmeppc
can benefit from the better ddb that was in macppc.
db_interface.c is left as an md part.

1 files changed, 2 insertions, 102 deletions

diff --git a/sys/arch/macppc/include/db_machdep.h b/sys/arch/macppc/include/db_machdep.h
index 970542767a8..522a7ac6294 100644
--- a/sys/arch/macppc/include/db_machdep.h
+++ b/sys/arch/macppc/include/db_machdep.h
@@ -1,103 +1,3 @@
-/*	$OpenBSD: db_machdep.h,v 1.4 2002/05/18 09:49:17 art Exp $	*/
-/*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.5 2002/06/08 16:02:13 miod Exp $	*/
 
-/*
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/*
- * Machine-dependent defines for new kernel debugger.
- */
-#ifndef	_PPC_DB_MACHDEP_H_
-#define	_PPC_DB_MACHDEP_H_
-
-#include <sys/types.h>
-#include <uvm/uvm_param.h>
-#include <machine/trap.h>
-
-/*
- * We use Elf64 symbols in DDB.
- */
-#define	DB_ELF_SYMBOLS
-#define	DB_ELFSIZE	32
-
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
-typedef	int		db_expr_t;	/* expression - signed */
-struct powerpc_saved_state {
-	struct trapframe tf;
-};
-typedef struct powerpc_saved_state db_regs_t;
-db_regs_t	ddb_regs;		/* register state */
-#define DDB_REGS	(&ddb_regs)
-
-#define	PC_REGS(regs)	((regs)->tf.srr0)
-
-#define	BKPT_INST	0x7C810808	/* breakpoint instruction */
-
-#define	BKPT_SIZE	(4)		/* size of breakpoint inst */
-#define	BKPT_SET(inst)	(BKPT_INST)
-
-#define	FIXUP_PC_AFTER_BREAK(regs)	((regs)->tf.srr0 -= 4)
-
-#define SR_SINGLESTEP 0x8000
-#define	db_clear_single_step(regs)	((regs)->tf.srr1 &= ~SR_SINGLESTEP)
-#define	db_set_single_step(regs)	((regs)->tf.srr1 |=  SR_SINGLESTEP)
-
-#define T_BREAKPOINT	0xffff
-#define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BREAKPOINT)
-
-#ifdef T_WATCHPOINT
-#define	IS_WATCHPOINT_TRAP(type, code)	((type) == T_WATCHPOINT)
-#else
-#define	IS_WATCHPOINT_TRAP(type, code)	0
-#endif
-
-#define	M_RTS		0xfc0007fe
-#define I_RTS		0x4c000020
-#define M_BC		0xfc000000
-#define I_BC		0x40000000
-#define M_B		0xfc000000
-#define I_B		0x50000000
-#define	M_RFI		0xfc0007fe
-#define	I_RFI		0x4c000064
-
-#define	inst_trap_return(ins)	(((ins)&M_RFI) == I_RFI)
-#define	inst_return(ins)	(((ins)&M_RTS) == I_RTS)
-#define	inst_call(ins)		(((ins)&M_BC ) == I_BC  || \
-				 ((ins)&M_B  ) == I_B )
-#define inst_load(ins)		0
-#define inst_store(ins)		0
-
-#ifdef _KERNEL
-
-void	kdb_kintr(void *);
-int	kdb_trap(int, void *);
-void	db_save_regs(struct trapframe *frame);
-void	ddb_trap(void);
-db_expr_t db_dumpframe(u_int32_t pframe, int (*pr)(const char *, ...));
-
-#endif /* _KERNEL */
-
-#endif	/* _PPC_DB_MACHDEP_H_ */
+#include <powerpc/db_machdep.h>