> Date: Sun, 30 Apr 2017 16:54:15 +0200
> From: Martin Pieuchot <[email protected]>
>
> I'd like to rename DDB's entry point to be able to filter it out from
> the list of symbols to instrument. All Elf symbols prefixed with 'db_'
> will be invisible from the dynamic tracing tool I'm working on.
>
> This consolidate the approach taken by ddb(4) where having a db_printf()
> allows you to instrument/put a break on printf(9).
>
> ok?
ok kettenis@
> Index: arch/alpha/alpha/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/db_interface.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 db_interface.c
> --- arch/alpha/alpha/db_interface.c 27 Apr 2016 11:03:24 -0000 1.22
> +++ arch/alpha/alpha/db_interface.c 30 Apr 2017 13:06:42 -0000
> @@ -220,7 +220,7 @@ db_write_bytes(addr, size, data)
> }
>
> void
> -Debugger()
> +db_enter()
> {
>
> __asm volatile("call_pal 0x81"); /* bugchk */
> Index: arch/alpha/alpha/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/lock_machdep.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 lock_machdep.c
> --- arch/alpha/alpha/lock_machdep.c 19 Mar 2016 11:34:22 -0000 1.4
> +++ arch/alpha/alpha/lock_machdep.c 30 Apr 2017 13:06:47 -0000
> @@ -80,7 +80,7 @@ __mp_lock_spin(struct __mp_lock *mpl)
>
> if (nticks == 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> @@ -128,7 +128,7 @@ __mp_unlock(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -150,7 +150,7 @@ __mp_release_all(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -170,7 +170,7 @@ __mp_release_all_but_one(struct __mp_loc
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/alpha/alpha/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/machdep.c,v
> retrieving revision 1.179
> diff -u -p -r1.179 machdep.c
> --- arch/alpha/alpha/machdep.c 30 Apr 2017 13:04:49 -0000 1.179
> +++ arch/alpha/alpha/machdep.c 30 Apr 2017 13:06:57 -0000
> @@ -762,7 +762,7 @@ nobootinfo:
> ddb_init();
>
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
> /*
> * Figure out our clock frequency, from RPB fields.
> Index: arch/alpha/dev/sgmap_typedep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/dev/sgmap_typedep.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 sgmap_typedep.c
> --- arch/alpha/dev/sgmap_typedep.c 11 Jul 2014 12:55:32 -0000 1.14
> +++ arch/alpha/dev/sgmap_typedep.c 30 Apr 2017 13:07:12 -0000
> @@ -222,7 +222,7 @@ __C(SGMAP_TYPE,_load)(bus_dma_tag_t t, b
>
> #if defined(SGMAP_DEBUG) && defined(DDB)
> if (__C(SGMAP_TYPE,_debug) > 1)
> - Debugger();
> + db_enter();
> #endif
>
> if (error == 0) {
> @@ -281,7 +281,7 @@ __C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t
>
> #if defined(SGMAP_DEBUG) && defined(DDB)
> if (__C(SGMAP_TYPE,_debug) > 1)
> - Debugger();
> + db_enter();
> #endif
>
> if (error == 0) {
> @@ -358,7 +358,7 @@ __C(SGMAP_TYPE,_load_uio)(bus_dma_tag_t
>
> #if defined(SGMAP_DEBUG) && defined(DDB)
> if (__C(SGMAP_TYPE,_debug) > 1)
> - Debugger();
> + db_enter();
> #endif
>
> if (error == 0) {
> Index: arch/alpha/tc/scc.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/tc/scc.c,v
> retrieving revision 1.29
> diff -u -p -r1.29 scc.c
> --- arch/alpha/tc/scc.c 2 Jul 2010 17:27:01 -0000 1.29
> +++ arch/alpha/tc/scc.c 30 Apr 2017 13:07:26 -0000
> @@ -1084,7 +1084,7 @@ scc_modem_intr(dev)
> if ((value & ZSRR0_BREAK) && CONSOLE_ON_UNIT(sc->sc_dv.dv_unit)) {
> #ifdef DDB
> splx(s); /* spl0()? */
> - Debugger();
> + db_enter();
> return;
> #else
> /* XXX maybe fall back to PROM? */
> Index: arch/amd64/amd64/cpu.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/amd64/cpu.c,v
> retrieving revision 1.102
> diff -u -p -r1.102 cpu.c
> --- arch/amd64/amd64/cpu.c 28 Jul 2016 21:57:57 -0000 1.102
> +++ arch/amd64/amd64/cpu.c 30 Apr 2017 13:07:33 -0000
> @@ -619,7 +619,7 @@ cpu_start_secondary(struct cpu_info *ci)
> printf("%s: failed to become ready\n", ci->ci_dev->dv_xname);
> #if defined(MPDEBUG) && defined(DDB)
> printf("dropping into debugger; continue from here to resume
> boot\n");
> - Debugger();
> + db_enter();
> #endif
> }
>
> @@ -655,7 +655,7 @@ cpu_boot_secondary(struct cpu_info *ci)
> printf("cpu failed to start\n");
> #if defined(MPDEBUG) && defined(DDB)
> printf("dropping into debugger; continue from here to resume
> boot\n");
> - Debugger();
> + db_enter();
> #endif
> }
> }
> Index: arch/amd64/amd64/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/amd64/db_interface.c,v
> retrieving revision 1.27
> diff -u -p -r1.27 db_interface.c
> --- arch/amd64/amd64/db_interface.c 20 Apr 2017 14:13:00 -0000 1.27
> +++ arch/amd64/amd64/db_interface.c 30 Apr 2017 13:19:51 -0000
> @@ -352,7 +352,7 @@ db_stopcpu(int cpu)
> void
> x86_ipi_db(struct cpu_info *ci)
> {
> - Debugger();
> + db_enter();
> }
> #endif /* MULTIPROCESSOR */
>
> @@ -396,7 +396,7 @@ db_machine_init(void)
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> breakpoint();
> }
> Index: arch/amd64/amd64/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/amd64/lock_machdep.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 lock_machdep.c
> --- arch/amd64/amd64/lock_machdep.c 20 Apr 2017 13:20:17 -0000 1.13
> +++ arch/amd64/amd64/lock_machdep.c 30 Apr 2017 13:08:11 -0000
> @@ -59,7 +59,7 @@ __mp_lock_spin(struct __mp_lock *mpl, u_
>
> if (--nticks <= 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> nticks = __mp_lock_spinout;
> }
> }
> @@ -99,7 +99,7 @@ ___mp_unlock(struct __mp_lock *mpl LOCK_
> #ifdef MP_LOCKDEBUG
> if (!__mp_lock_held(mpl)) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -149,7 +149,7 @@ ___mp_release_all_but_one(struct __mp_lo
> #ifdef MP_LOCKDEBUG
> if (!__mp_lock_held(mpl)) {
> db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/amd64/amd64/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/amd64/machdep.c,v
> retrieving revision 1.227
> diff -u -p -r1.227 machdep.c
> --- arch/amd64/amd64/machdep.c 30 Apr 2017 13:04:49 -0000 1.227
> +++ arch/amd64/amd64/machdep.c 30 Apr 2017 13:08:57 -0000
> @@ -1602,7 +1602,7 @@ init_x86_64(paddr_t first_avail)
> db_machine_init();
> ddb_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/arm/arm/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/arm/db_interface.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 db_interface.c
> --- arch/arm/arm/db_interface.c 20 Apr 2016 07:59:25 -0000 1.11
> +++ arch/arm/arm/db_interface.c 30 Apr 2017 13:19:53 -0000
> @@ -340,7 +340,7 @@ db_write_bytes(vaddr_t addr, size_t size
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> asm(".word 0xe7ffffff");
> }
> Index: arch/arm/arm/undefined.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/arm/undefined.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 undefined.c
> --- arch/arm/arm/undefined.c 30 Apr 2017 13:04:49 -0000 1.9
> +++ arch/arm/arm/undefined.c 30 Apr 2017 13:09:00 -0000
> @@ -242,7 +242,7 @@ undefinedinstruction(trapframe_t *frame)
> if ((fault_code & FAULT_USER) == 0) {
> printf("Undefined instruction in kernel\n");
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/arm/cortex/ampintc.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/cortex/ampintc.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 ampintc.c
> --- arch/arm/cortex/ampintc.c 21 Mar 2017 21:51:03 -0000 1.19
> +++ arch/arm/cortex/ampintc.c 30 Apr 2017 13:09:03 -0000
> @@ -491,7 +491,7 @@ ampintc_irq_handler(void *frame)
> if ((cnt++ % 100) == 0) {
> printf("irq %d fired * _100\n", iack_val);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/arm64/arm64/arm64_mutex.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/arm64/arm64_mutex.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 arm64_mutex.c
> --- arch/arm64/arm64/arm64_mutex.c 17 Dec 2016 23:38:33 -0000 1.1
> +++ arch/arm64/arm64/arm64_mutex.c 30 Apr 2017 13:09:07 -0000
> @@ -61,7 +61,7 @@ mtx_enter(struct mutex *mtx)
> #ifdef MP_LOCKDEBUG
> if (--ticks == 0) {
> db_printf("%s(%p): lock spun out", __func__, mtx);
> - Debugger();
> + db_enter();
> ticks = __mp_lock_spinout;
> }
> #endif
> Index: arch/arm64/arm64/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/arm64/db_interface.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 db_interface.c
> --- arch/arm64/arm64/db_interface.c 17 Feb 2017 17:16:04 -0000 1.2
> +++ arch/arm64/arm64/db_interface.c 30 Apr 2017 13:19:55 -0000
> @@ -251,7 +251,7 @@ db_write_bytes(vaddr_t addr, size_t size
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> asm("brk 0");
> }
> Index: arch/arm64/arm64/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/arm64/machdep.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 machdep.c
> --- arch/arm64/arm64/machdep.c 29 Apr 2017 10:05:49 -0000 1.14
> +++ arch/arm64/arm64/machdep.c 30 Apr 2017 13:09:13 -0000
> @@ -962,7 +962,7 @@ initarm(struct arm64_bootparams *abp)
> ddb_init();
>
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> softintr_init();
> Index: arch/arm64/dev/agintc.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/dev/agintc.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 agintc.c
> --- arch/arm64/dev/agintc.c 29 Apr 2017 18:13:25 -0000 1.2
> +++ arch/arm64/dev/agintc.c 30 Apr 2017 13:09:30 -0000
> @@ -616,7 +616,7 @@ agintc_irq_handler(void *frame)
> if ((cnt++ % 100) == 0) {
> printf("irq %d fired * _100\n", irq);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
> }
> Index: arch/arm64/dev/ampintc.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/dev/ampintc.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 ampintc.c
> --- arch/arm64/dev/ampintc.c 8 Apr 2017 22:31:33 -0000 1.8
> +++ arch/arm64/dev/ampintc.c 30 Apr 2017 13:09:17 -0000
> @@ -516,7 +516,7 @@ ampintc_irq_handler(void *frame)
> if ((cnt++ % 100) == 0) {
> printf("irq %d fired * _100\n", iack_val);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/arm64/dev/bcm2836_intr.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/dev/bcm2836_intr.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 bcm2836_intr.c
> --- arch/arm64/dev/bcm2836_intr.c 24 Feb 2017 17:16:41 -0000 1.2
> +++ arch/arm64/dev/bcm2836_intr.c 30 Apr 2017 13:09:25 -0000
> @@ -442,7 +442,7 @@ bcm_intc_call_handler(int irq, void *fra
> static int cnt = 0;
> if ((cnt++ % 100) == 0) {
> printf("irq %d fired * _100\n", irq);
> - Debugger();
> + db_enter();
> }
> }
> #endif
> Index: arch/arm64/dev/pluart.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/dev/pluart.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 pluart.c
> --- arch/arm64/dev/pluart.c 30 Apr 2017 13:04:49 -0000 1.4
> +++ arch/arm64/dev/pluart.c 30 Apr 2017 13:09:21 -0000
> @@ -310,7 +310,7 @@ pluart_intr(void *arg)
> #ifdef DDB
> if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
> if (db_console)
> - Debugger();
> + db_enter();
> continue;
> }
> #endif
> Index: arch/armv7/armv7/armv7_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/armv7/armv7_machdep.c,v
> retrieving revision 1.47
> diff -u -p -r1.47 armv7_machdep.c
> --- arch/armv7/armv7/armv7_machdep.c 24 Mar 2017 13:04:16 -0000 1.47
> +++ arch/armv7/armv7/armv7_machdep.c 30 Apr 2017 13:09:36 -0000
> @@ -790,7 +790,7 @@ initarm(void *arg0, void *arg1, void *ar
> ddb_init();
>
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
> printf("board type: %u\n", board_id);
>
> Index: arch/armv7/broadcom/bcm2836_intr.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/broadcom/bcm2836_intr.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 bcm2836_intr.c
> --- arch/armv7/broadcom/bcm2836_intr.c 7 Aug 2016 18:43:17 -0000
> 1.2
> +++ arch/armv7/broadcom/bcm2836_intr.c 30 Apr 2017 13:09:49 -0000
> @@ -447,7 +447,7 @@ bcm_intc_call_handler(int irq, void *fra
> static int cnt = 0;
> if ((cnt++ % 100) == 0) {
> printf("irq %d fired * _100\n", irq);
> - Debugger();
> + db_enter();
> }
> }
> #endif
> Index: arch/armv7/dev/pluart.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/dev/pluart.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 pluart.c
> --- arch/armv7/dev/pluart.c 30 Apr 2017 13:04:49 -0000 1.3
> +++ arch/armv7/dev/pluart.c 30 Apr 2017 13:09:52 -0000
> @@ -314,7 +314,7 @@ pluart_intr(void *arg)
> #ifdef DDB
> if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
> if (db_console)
> - Debugger();
> + db_enter();
> continue;
> }
> #endif
> Index: arch/armv7/omap/if_cpsw.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/omap/if_cpsw.c,v
> retrieving revision 1.42
> diff -u -p -r1.42 if_cpsw.c
> --- arch/armv7/omap/if_cpsw.c 22 Jan 2017 10:17:37 -0000 1.42
> +++ arch/armv7/omap/if_cpsw.c 30 Apr 2017 13:09:58 -0000
> @@ -1175,7 +1175,7 @@ cpsw_txintr(void *arg)
> cpsw_get_txdesc(sc, sc->sc_txhead, &bd);
>
> if (bd.buflen == 0) {
> - /* Debugger(); */
> + /* db_enter(); */
> }
>
> if ((bd.flags & CPDMA_BD_SOP) == 0)
> @@ -1268,7 +1268,7 @@ cpsw_miscintr(void *arg)
> stat = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
> CPSW_CPDMA_RX_CP(0));
> printf("CPSW_CPDMA_RX0_CP %x\n", stat);
>
> - /* Debugger(); */
> + /* db_enter(); */
>
> bus_space_write_4(sc->sc_bst, sc->sc_bsh,
> CPSW_CPDMA_DMA_INTMASK_CLEAR, dmastat);
> dmastat = bus_space_read_4(sc->sc_bst, sc->sc_bsh,
> CPSW_CPDMA_DMA_INTSTAT_MASKED);
> Index: arch/hppa/hppa/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/hppa/hppa/db_interface.c,v
> retrieving revision 1.38
> diff -u -p -r1.38 db_interface.c
> --- arch/hppa/hppa/db_interface.c 19 Sep 2016 21:18:35 -0000 1.38
> +++ arch/hppa/hppa/db_interface.c 30 Apr 2017 13:10:06 -0000
> @@ -125,7 +125,7 @@ struct db_variable *db_eregs = db_regs +
> int db_active = 0;
>
> void
> -Debugger()
> +db_enter(void)
> {
> extern int kernelmapped; /* from locore.S */
> if (kernelmapped)
> Index: arch/hppa/hppa/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/hppa/hppa/lock_machdep.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 lock_machdep.c
> --- arch/hppa/hppa/lock_machdep.c 19 Mar 2016 11:34:22 -0000 1.9
> +++ arch/hppa/hppa/lock_machdep.c 30 Apr 2017 13:10:10 -0000
> @@ -88,7 +88,7 @@ __mp_lock_spin(struct __mp_lock *mpl)
>
> if (nticks == 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> @@ -136,7 +136,7 @@ __mp_unlock(struct __mp_lock *mpl)
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_unlock(%p): lock not held - %p != %p\n",
> mpl, mpl->mpl_cpu, curcpu());
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -159,7 +159,7 @@ __mp_release_all(struct __mp_lock *mpl)
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all(%p): lock not held - %p != %p\n",
> mpl, mpl->mpl_cpu, curcpu());
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -181,7 +181,7 @@ __mp_release_all_but_one(struct __mp_loc
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all_but_one(%p): lock not held - "
> "%p != %p\n", mpl, mpl->mpl_cpu, curcpu());
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/hppa/hppa/pmap.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/hppa/hppa/pmap.c,v
> retrieving revision 1.172
> diff -u -p -r1.172 pmap.c
> --- arch/hppa/hppa/pmap.c 19 Oct 2016 08:28:20 -0000 1.172
> +++ arch/hppa/hppa/pmap.c 30 Apr 2017 13:10:13 -0000
> @@ -1194,7 +1194,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
>
> if (pmap_initialized && (pg = PHYS_TO_VM_PAGE(PTE_PAGE(pte)))) {
> if (pmap_check_alias(pg, va, pte))
> - Debugger();
> + db_enter();
> }
> }
> #endif
> Index: arch/i386/i386/cpu.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/cpu.c,v
> retrieving revision 1.81
> diff -u -p -r1.81 cpu.c
> --- arch/i386/i386/cpu.c 28 Mar 2017 17:28:35 -0000 1.81
> +++ arch/i386/i386/cpu.c 30 Apr 2017 13:10:17 -0000
> @@ -575,7 +575,7 @@ cpu_boot_secondary(struct cpu_info *ci)
> if (!(ci->ci_flags & CPUF_RUNNING)) {
> printf("%s failed to become ready\n", ci->ci_dev.dv_xname);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/i386/i386/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/db_interface.c,v
> retrieving revision 1.34
> diff -u -p -r1.34 db_interface.c
> --- arch/i386/i386/db_interface.c 3 Mar 2017 20:49:47 -0000 1.34
> +++ arch/i386/i386/db_interface.c 30 Apr 2017 13:19:57 -0000
> @@ -355,7 +355,7 @@ db_machine_init(void)
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> __asm__("int $3");
> }
> Index: arch/i386/i386/db_mp.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/db_mp.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 db_mp.c
> --- arch/i386/i386/db_mp.c 20 Apr 2017 14:13:00 -0000 1.9
> +++ arch/i386/i386/db_mp.c 30 Apr 2017 13:10:21 -0000
> @@ -137,5 +137,5 @@ db_stopcpu(int cpu)
> void
> i386_ipi_db(struct cpu_info *ci)
> {
> - Debugger();
> + db_enter();
> }
> Index: arch/i386/i386/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/lock_machdep.c,v
> retrieving revision 1.22
> diff -u -p -r1.22 lock_machdep.c
> --- arch/i386/i386/lock_machdep.c 20 Apr 2017 13:20:17 -0000 1.22
> +++ arch/i386/i386/lock_machdep.c 30 Apr 2017 13:10:24 -0000
> @@ -78,7 +78,7 @@ __mp_lock_spin(struct __mp_lock *mpl, u_
>
> if (--nticks <= 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> nticks = __mp_lock_spinout;
> }
> }
> @@ -118,7 +118,7 @@ ___mp_unlock(struct __mp_lock *mpl LOCK_
> #ifdef MP_LOCKDEBUG
> if (!__mp_lock_held(mpl)) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/i386/i386/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/machdep.c,v
> retrieving revision 1.599
> diff -u -p -r1.599 machdep.c
> --- arch/i386/i386/machdep.c 30 Apr 2017 13:04:49 -0000 1.599
> +++ arch/i386/i386/machdep.c 30 Apr 2017 13:10:30 -0000
> @@ -3377,7 +3377,7 @@ init386(paddr_t first_avail)
> db_machine_init();
> ddb_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> softintr_init();
> Index: arch/landisk/dev/power.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/landisk/dev/power.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 power.c
> --- arch/landisk/dev/power.c 11 Jul 2014 08:18:30 -0000 1.6
> +++ arch/landisk/dev/power.c 30 Apr 2017 13:10:46 -0000
> @@ -102,7 +102,7 @@ power_intr(void *arg)
> if (status & BTN_POWER_BIT) {
> #ifdef DEBUG
> printf("%s switched\n", sc->sc_dev.dv_xname);
> - Debugger();
> + db_enter();
> #endif
> _reg_write_1(LANDISK_PWRSW_INTCLR, 1);
> if (allowpowerdown == 1) {
> Index: arch/landisk/landisk/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/landisk/landisk/machdep.c,v
> retrieving revision 1.44
> diff -u -p -r1.44 machdep.c
> --- arch/landisk/landisk/machdep.c 9 Oct 2016 11:25:39 -0000 1.44
> +++ arch/landisk/landisk/machdep.c 30 Apr 2017 13:10:49 -0000
> @@ -177,7 +177,7 @@ landisk_startup(int howto, char *_esym)
> db_machine_init();
> ddb_init();
> if (boothowto & RB_KDB) {
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/loongson/dev/bonito.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/loongson/dev/bonito.c,v
> retrieving revision 1.31
> diff -u -p -r1.31 bonito.c
> --- arch/loongson/dev/bonito.c 6 Mar 2016 19:42:27 -0000 1.31
> +++ arch/loongson/dev/bonito.c 30 Apr 2017 13:10:51 -0000
> @@ -714,7 +714,7 @@ bonito_intr_dispatch(uint64_t isr, int s
> REGVAL(BONITO_INTISR), REGVAL(BONITO_INTEN),
> frame->ipl, bonito_imask[frame->ipl]);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> #endif
> }
> Index: arch/loongson/loongson/generic2e_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/loongson/loongson/generic2e_machdep.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 generic2e_machdep.c
> --- arch/loongson/loongson/generic2e_machdep.c 30 Aug 2016 12:15:28
> -0000 1.8
> +++ arch/loongson/loongson/generic2e_machdep.c 30 Apr 2017 13:10:53
> -0000
> @@ -308,7 +308,7 @@ generic2e_isa_intr(uint32_t hwpend, stru
> " isaimr %08x\n", ocw1, ocw2, frame->ipl,
> bonito_imask[frame->ipl], loongson_isaimr);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> #endif
> }
> Index: arch/loongson/loongson/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/loongson/loongson/machdep.c,v
> retrieving revision 1.76
> diff -u -p -r1.76 machdep.c
> --- arch/loongson/loongson/machdep.c 22 Apr 2017 15:37:39 -0000 1.76
> +++ arch/loongson/loongson/machdep.c 30 Apr 2017 13:10:55 -0000
> @@ -859,7 +859,7 @@ mips_init(uint64_t argc, uint64_t argv,
> #ifdef DDB
> db_machine_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> /*
> Index: arch/luna88k/dev/mb89352.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/luna88k/dev/mb89352.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 mb89352.c
> --- arch/luna88k/dev/mb89352.c 16 Mar 2017 18:15:20 -0000 1.21
> +++ arch/luna88k/dev/mb89352.c 30 Apr 2017 13:11:08 -0000
> @@ -140,7 +140,7 @@
> #include <luna88k/dev/mb89352var.h>
>
> #ifndef DDB
> -#define Debugger() panic("should call debugger here (mb89352.c)")
> +#define db_enter() panic("should call debugger here (mb89352.c)")
> #endif /* ! DDB */
>
> #ifdef SPC_DEBUG
> Index: arch/luna88k/dev/mb89352var.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/luna88k/dev/mb89352var.h,v
> retrieving revision 1.5
> diff -u -p -r1.5 mb89352var.h
> --- arch/luna88k/dev/mb89352var.h 8 May 2014 22:17:33 -0000 1.5
> +++ arch/luna88k/dev/mb89352var.h 30 Apr 2017 13:11:00 -0000
> @@ -190,8 +190,8 @@ struct spc_softc {
> #define SPC_DOBREAK 0x40
> extern int spc_debug; /* SPC_SHOWSTART|SPC_SHOWMISC|SPC_SHOWTRACE; */
> #define SPC_PRINT(b, s) do {if ((spc_debug & (b)) != 0) printf s;}
> while (0)
> -#define SPC_BREAK() do {if ((spc_debug & SPC_DOBREAK) != 0) Debugger();}
> while (0)
> -#define SPC_ASSERT(x) do {if (x) {} else {printf("%s at line %d:
> assertion failed\n", sc->sc_dev.dv_xname, __LINE__); Debugger();}} while (0)
> +#define SPC_BREAK() do {if ((spc_debug & SPC_DOBREAK) != 0) db_enter();}
> while (0)
> +#define SPC_ASSERT(x) do {if (x) {} else {printf("%s at line %d:
> assertion failed\n", sc->sc_dev.dv_xname, __LINE__); db_enter();}} while (0)
> #else
> #define SPC_PRINT(b, s)
> #define SPC_BREAK()
> Index: arch/luna88k/dev/siotty.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/luna88k/dev/siotty.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 siotty.c
> --- arch/luna88k/dev/siotty.c 20 Mar 2017 19:37:54 -0000 1.17
> +++ arch/luna88k/dev/siotty.c 30 Apr 2017 13:11:11 -0000
> @@ -162,7 +162,7 @@ siottyintr(int chan)
> #if 0 && defined(DDB) /* ?!?! fails to resume ?!?! */
> if ((rr & RR_BREAK) && tp->t_dev == cn_tab->cn_dev) {
> if (db_console)
> - Debugger();
> + db_enter();
> return;
> }
> #endif
> Index: arch/luna88k/luna88k/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/luna88k/luna88k/machdep.c,v
> retrieving revision 1.123
> diff -u -p -r1.123 machdep.c
> --- arch/luna88k/luna88k/machdep.c 19 Mar 2017 10:57:29 -0000 1.123
> +++ arch/luna88k/luna88k/machdep.c 30 Apr 2017 13:11:16 -0000
> @@ -248,7 +248,7 @@ consinit()
> db_machine_init();
> ddb_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
> }
>
> @@ -1323,7 +1323,7 @@ luna88k_ipi_handler(struct trapframe *ef
> * If ddb is hoping to us, it's our turn to enter ddb now.
> */
> if (ci->ci_cpuid == ddb_mp_nextcpu)
> - Debugger();
> + db_enter();
> #endif
> }
> if (ipi & CI_IPI_NOTIFY) {
> Index: arch/m88k/m88k/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/m88k/m88k/db_interface.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 db_interface.c
> --- arch/m88k/m88k/db_interface.c 9 Mar 2016 08:58:50 -0000 1.21
> +++ arch/m88k/m88k/db_interface.c 30 Apr 2017 13:11:37 -0000
> @@ -435,7 +435,7 @@ kdbprinttrap(int type)
> }
>
> void
> -Debugger()
> +db_enter(void)
> {
> asm (ENTRY_ASM); /* entry trap */
> /* ends up at ddb_entry_trap below */
> Index: arch/m88k/m88k/mplock.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/m88k/m88k/mplock.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 mplock.c
> --- arch/m88k/m88k/mplock.c 19 Mar 2016 11:34:22 -0000 1.4
> +++ arch/m88k/m88k/mplock.c 30 Apr 2017 13:11:49 -0000
> @@ -57,7 +57,7 @@ __mp_lock_spin(struct __mp_lock *mpl)
>
> if (nticks == 0) {
> db_printf("__mp_lock(0x%x): lock spun out", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> @@ -109,7 +109,7 @@ __mp_unlock(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != ci) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -132,7 +132,7 @@ __mp_release_all(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != ci) {
> db_printf("__mp_release_all(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -156,7 +156,7 @@ __mp_release_all_but_one(struct __mp_loc
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != ci) {
> db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/macppc/dev/macintr.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/dev/macintr.c,v
> retrieving revision 1.53
> diff -u -p -r1.53 macintr.c
> --- arch/macppc/dev/macintr.c 8 Sep 2015 08:29:35 -0000 1.53
> +++ arch/macppc/dev/macintr.c 30 Apr 2017 13:11:51 -0000
> @@ -249,7 +249,7 @@ macintr_prog_button (void *arg)
> {
> #ifdef DDB
> if (db_console)
> - Debugger();
> + db_enter();
> #else
> printf("programmer button pressed, debugger not available\n");
> #endif
> Index: arch/macppc/dev/openpic.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/dev/openpic.c,v
> retrieving revision 1.83
> diff -u -p -r1.83 openpic.c
> --- arch/macppc/dev/openpic.c 8 Sep 2015 08:29:35 -0000 1.83
> +++ arch/macppc/dev/openpic.c 30 Apr 2017 13:11:53 -0000
> @@ -748,7 +748,7 @@ void
> openpic_ipi_ddb(void)
> {
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
> #endif /* MULTIPROCESSOR */
> Index: arch/macppc/dev/pgs.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/dev/pgs.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 pgs.c
> --- arch/macppc/dev/pgs.c 1 Jul 2013 16:53:24 -0000 1.3
> +++ arch/macppc/dev/pgs.c 30 Apr 2017 13:11:56 -0000
> @@ -89,7 +89,7 @@ pgs_intr(void *v)
> {
> #ifdef DDB
> if (db_console)
> - Debugger();
> + db_enter();
> #else
> printf("programmer-switch pressed, debugger not available.\n");
> #endif
> Index: arch/macppc/dev/sysbutton.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/dev/sysbutton.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 sysbutton.c
> --- arch/macppc/dev/sysbutton.c 13 Jun 2008 00:31:09 -0000 1.4
> +++ arch/macppc/dev/sysbutton.c 30 Apr 2017 13:11:58 -0000
> @@ -85,7 +85,7 @@ sysbutton_intr(void *v)
> */
> #ifdef DDB
> if (db_console)
> - Debugger();
> + db_enter();
> #endif
>
> return 1;
> Index: arch/macppc/dev/zs.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/dev/zs.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 zs.c
> --- arch/macppc/dev/zs.c 14 Mar 2016 23:08:05 -0000 1.26
> +++ arch/macppc/dev/zs.c 30 Apr 2017 13:12:01 -0000
> @@ -1096,7 +1096,7 @@ zs_abort(struct zs_chanstate *channel)
> extern int db_active;
>
> if (!db_active)
> - Debugger();
> + db_enter();
> }
> #endif
> }
> Index: arch/macppc/macppc/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/macppc/macppc/machdep.c,v
> retrieving revision 1.179
> diff -u -p -r1.179 machdep.c
> --- arch/macppc/macppc/machdep.c 9 Oct 2016 11:25:40 -0000 1.179
> +++ arch/macppc/macppc/machdep.c 30 Apr 2017 13:12:03 -0000
> @@ -311,7 +311,7 @@ initppc(startkernel, endkernel, args)
>
> #ifdef DDB
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> /*
> Index: arch/mips64/mips64/ipifuncs.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/mips64/mips64/ipifuncs.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 ipifuncs.c
> --- arch/mips64/mips64/ipifuncs.c 19 Feb 2017 08:35:13 -0000 1.13
> +++ arch/mips64/mips64/ipifuncs.c 30 Apr 2017 13:12:05 -0000
> @@ -237,6 +237,6 @@ void
> mips64_ipi_ddb(void)
> {
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
> Index: arch/mips64/mips64/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/mips64/mips64/lock_machdep.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 lock_machdep.c
> --- arch/mips64/mips64/lock_machdep.c 19 Mar 2016 11:34:22 -0000 1.2
> +++ arch/mips64/mips64/lock_machdep.c 30 Apr 2017 13:12:07 -0000
> @@ -58,7 +58,7 @@ __mp_lock_spin(struct __mp_lock *mpl)
>
> if (nticks == 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> @@ -106,7 +106,7 @@ __mp_unlock(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -129,7 +129,7 @@ __mp_release_all(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -149,7 +149,7 @@ __mp_release_all_but_one(struct __mp_loc
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/mips64/mips64/mutex.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/mips64/mips64/mutex.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 mutex.c
> --- arch/mips64/mips64/mutex.c 20 Apr 2017 13:57:30 -0000 1.5
> +++ arch/mips64/mips64/mutex.c 30 Apr 2017 13:12:09 -0000
> @@ -64,7 +64,7 @@ __mtx_enter(struct mutex *mtx)
> #ifdef MP_LOCKDEBUG
> if (--nticks == 0) {
> db_printf("%s(%p): lock spun out", __func__, mtx);
> - Debugger();
> + db_enter();
> nticks = __mp_lock_spinout;
> }
> #endif
> Index: arch/octeon/octeon/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/octeon/octeon/machdep.c,v
> retrieving revision 1.87
> diff -u -p -r1.87 machdep.c
> --- arch/octeon/octeon/machdep.c 24 Apr 2017 13:54:28 -0000 1.87
> +++ arch/octeon/octeon/machdep.c 30 Apr 2017 13:12:14 -0000
> @@ -513,7 +513,7 @@ mips_init(__register_t a0, __register_t
> #ifdef DDB
> db_machine_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> #ifdef MULTIPROCESSOR
> Index: arch/powerpc/ddb/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/powerpc/ddb/db_interface.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 db_interface.c
> --- arch/powerpc/ddb/db_interface.c 6 Mar 2016 13:41:34 -0000 1.2
> +++ arch/powerpc/ddb/db_interface.c 30 Apr 2017 13:12:20 -0000
> @@ -65,7 +65,7 @@ int db_active = 0;
> int db_trap_glue(struct trapframe *frame); /* called from locore */
>
> void
> -Debugger()
> +db_enter()
> {
> ddb_trap();
> }
> @@ -189,7 +189,7 @@ db_enter_ddb(void)
> void
> ppc_ipi_db(struct cpu_info *ci)
> {
> - Debugger();
> + db_enter();
> }
>
> void
> Index: arch/powerpc/powerpc/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/powerpc/powerpc/lock_machdep.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 lock_machdep.c
> --- arch/powerpc/powerpc/lock_machdep.c 19 Mar 2016 11:34:22 -0000
> 1.4
> +++ arch/powerpc/powerpc/lock_machdep.c 30 Apr 2017 13:12:27 -0000
> @@ -56,7 +56,7 @@ __mp_lock_spin(struct __mp_lock *mpl)
>
> if (nticks == 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> @@ -104,7 +104,7 @@ __mp_unlock(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_unlock(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -126,7 +126,7 @@ __mp_release_all(struct __mp_lock *mpl)
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> @@ -147,7 +147,7 @@ __mp_release_all_but_one(struct __mp_loc
> #ifdef MP_LOCKDEBUG
> if (mpl->mpl_cpu != curcpu()) {
> db_printf("__mp_release_all_but_one(%p): not held lock\n", mpl);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/powerpc/powerpc/mutex.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/powerpc/powerpc/mutex.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 mutex.c
> --- arch/powerpc/powerpc/mutex.c 20 Apr 2017 13:57:30 -0000 1.4
> +++ arch/powerpc/powerpc/mutex.c 30 Apr 2017 13:12:34 -0000
> @@ -66,7 +66,7 @@ __mtx_enter(struct mutex *mtx)
> #if defined(MP_LOCKDEBUG)
> if (--nticks == 0) {
> db_printf("%s: %p lock spun out", __func__, mtx);
> - Debugger();
> + db_enter();
> }
> #endif
> }
> Index: arch/sgi/hpc/zs.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sgi/hpc/zs.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 zs.c
> --- arch/sgi/hpc/zs.c 30 Apr 2017 13:04:49 -0000 1.14
> +++ arch/sgi/hpc/zs.c 30 Apr 2017 13:12:43 -0000
> @@ -559,7 +559,7 @@ void
> zs_abort(struct zs_chanstate *cs)
> {
> #if defined(DDB)
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/sgi/sgi/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sgi/sgi/machdep.c,v
> retrieving revision 1.155
> diff -u -p -r1.155 machdep.c
> --- arch/sgi/sgi/machdep.c 2 Apr 2017 15:48:19 -0000 1.155
> +++ arch/sgi/sgi/machdep.c 30 Apr 2017 13:12:47 -0000
> @@ -653,7 +653,7 @@ mips_init(int argc, void *argv, caddr_t
> #ifdef DDB
> db_machine_init();
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> /*
> Index: arch/sh/dev/scif.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sh/dev/scif.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 scif.c
> --- arch/sh/dev/scif.c 5 Mar 2016 17:16:33 -0000 1.16
> +++ arch/sh/dev/scif.c 30 Apr 2017 13:12:54 -0000
> @@ -1133,7 +1133,7 @@ scifintr(void *arg)
> #ifdef DDB
> if (ISSET(sc->sc_hwflags, SCIF_HW_CONSOLE) &&
> db_console != 0) {
> - Debugger();
> + db_enter();
> }
> #endif /* DDB */
> }
> Index: arch/sh/sh/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sh/sh/db_interface.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 db_interface.c
> --- arch/sh/sh/db_interface.c 21 Jan 2017 05:42:03 -0000 1.9
> +++ arch/sh/sh/db_interface.c 30 Apr 2017 13:20:00 -0000
> @@ -147,7 +147,7 @@ db_ktrap(int type, int code, db_regs_t *
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> __asm volatile("trapa %0" :: "i"(_SH_TRA_BREAK));
> }
> Index: arch/socppc/socppc/machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/socppc/socppc/machdep.c,v
> retrieving revision 1.71
> diff -u -p -r1.71 machdep.c
> --- arch/socppc/socppc/machdep.c 9 Oct 2016 11:25:40 -0000 1.71
> +++ arch/socppc/socppc/machdep.c 30 Apr 2017 13:13:02 -0000
> @@ -355,7 +355,7 @@ initppc(u_int startkernel, u_int endkern
>
> #ifdef DDB
> if (boothowto & RB_KDB)
> - Debugger();
> + db_enter();
> #endif
>
> if (boothowto & RB_CONFIG) {
> Index: arch/sparc64/dev/consinit.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/consinit.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 consinit.c
> --- arch/sparc64/dev/consinit.c 7 Mar 2016 13:21:51 -0000 1.15
> +++ arch/sparc64/dev/consinit.c 30 Apr 2017 13:13:08 -0000
> @@ -111,7 +111,7 @@ prom_cngetc(dev_t dev)
> #ifdef DDB
> if (ch == '+') {
> if (nplus++ > 3)
> - Debugger();
> + db_enter();
> } else
> nplus = 0;
> #endif
> Index: arch/sparc64/dev/fd.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/fd.c,v
> retrieving revision 1.46
> diff -u -p -r1.46 fd.c
> --- arch/sparc64/dev/fd.c 7 Jun 2016 06:37:33 -0000 1.46
> +++ arch/sparc64/dev/fd.c 30 Apr 2017 13:13:13 -0000
> @@ -1459,7 +1459,7 @@ loop:
> printf("fdcintr: block %lld != blkno %lld\n",
> (long long)block, (long long)fd->sc_blkno);
> #if defined(FD_DEBUG) && defined(DDB)
> - Debugger();
> + db_enter();
> #endif
> }
> }
> Index: arch/sparc64/dev/iommu.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/iommu.c,v
> retrieving revision 1.73
> diff -u -p -r1.73 iommu.c
> --- arch/sparc64/dev/iommu.c 4 May 2016 18:26:12 -0000 1.73
> +++ arch/sparc64/dev/iommu.c 30 Apr 2017 13:13:18 -0000
> @@ -774,7 +774,7 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_
> (int)sgsize, flags);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> }
> #endif
> @@ -843,7 +843,7 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_
> iommu_dvmamap_print_map(t, is, map);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> }
> #endif
> @@ -993,7 +993,7 @@ iommu_dvmamap_load_raw(bus_dma_tag_t t,
> "failed!\n", (int)sgsize, flags);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #else
> panic("");
> #endif
> @@ -1062,7 +1062,7 @@ iommu_dvmamap_load_raw(bus_dma_tag_t t,
> iommu_dvmamap_print_map(t, is, map);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> }
> #endif
> @@ -1320,7 +1320,7 @@ iommu_dvmamap_unload(bus_dma_tag_t t, bu
> printf("iommu_dvmamap_unload: No dvmastart\n");
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> return;
> }
> @@ -1409,7 +1409,7 @@ iommu_dvmamap_validate_map(bus_dma_tag_t
> iommu_dvmamap_print_map(t, is, map);
> #if defined(DDB) && defined(DEBUG)
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: arch/sparc64/dev/pcons.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/pcons.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 pcons.c
> --- arch/sparc64/dev/pcons.c 7 Mar 2016 13:21:51 -0000 1.21
> +++ arch/sparc64/dev/pcons.c 30 Apr 2017 13:13:28 -0000
> @@ -93,7 +93,7 @@ typedef struct cnm_state {
> } cnm_state_t;
> #ifdef DDB
> #include <ddb/db_var.h>
> -#define cn_trap() do { if (db_console) Debugger(); } while (0)
> +#define cn_trap() do { if (db_console) db_enter(); } while (0)
> #else
> #define cn_trap()
> #endif
> Index: arch/sparc64/dev/sab.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/sab.c,v
> retrieving revision 1.31
> diff -u -p -r1.31 sab.c
> --- arch/sparc64/dev/sab.c 30 May 2013 16:15:01 -0000 1.31
> +++ arch/sparc64/dev/sab.c 30 Apr 2017 13:13:39 -0000
> @@ -1398,7 +1398,7 @@ sabtty_abort(sc)
> if (db_console == 0)
> return;
> if (db_active == 0)
> - Debugger();
> + db_enter();
> else
> callrom();
> #else
> Index: arch/sparc64/dev/sbbc.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/sbbc.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 sbbc.c
> --- arch/sparc64/dev/sbbc.c 20 Oct 2012 12:00:33 -0000 1.11
> +++ arch/sparc64/dev/sbbc.c 30 Apr 2017 13:13:53 -0000
> @@ -424,7 +424,7 @@ sbbc_intr_cons(struct sbbc_softc *sc, ui
> #ifdef DDB
> if ((reason & SBBC_SRAM_CONS_BRK) && sc == sbbc_cons_input) {
> if (db_console)
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/sparc64/dev/vcons.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/vcons.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 vcons.c
> --- arch/sparc64/dev/vcons.c 10 May 2014 11:49:31 -0000 1.14
> +++ arch/sparc64/dev/vcons.c 30 Apr 2017 13:13:57 -0000
> @@ -140,7 +140,7 @@ vcons_cnlookc(dev_t dev, int *cp)
> if (hv_cons_getchar(&ch) == H_EOK) {
> #ifdef DDB
> if (ch == -1 && db_console)
> - Debugger();
> + db_enter();
> #endif
> *cp = ch;
> return (1);
> Index: arch/sparc64/dev/viommu.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/viommu.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 viommu.c
> --- arch/sparc64/dev/viommu.c 4 May 2016 18:26:12 -0000 1.17
> +++ arch/sparc64/dev/viommu.c 30 Apr 2017 13:14:01 -0000
> @@ -384,7 +384,7 @@ viommu_dvmamap_load(bus_dma_tag_t t, bus
> (int)sgsize, flags);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #endif
> }
> #endif
> @@ -579,7 +579,7 @@ viommu_dvmamap_load_raw(bus_dma_tag_t t,
> "failed!\n", (int)sgsize, flags);
> #ifdef DDB
> if (iommudebug & IDB_BREAK)
> - Debugger();
> + db_enter();
> #else
> panic("");
> #endif
> Index: arch/sparc64/dev/zs.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/zs.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 zs.c
> --- arch/sparc64/dev/zs.c 30 Apr 2017 13:04:49 -0000 1.28
> +++ arch/sparc64/dev/zs.c 30 Apr 2017 13:20:21 -0000
> @@ -670,8 +670,6 @@ zs_write_data(cs, val)
> * XXX - I think I like the mvme167 code better. -gwr
> ****************************************************************/
>
> -extern void Debugger(void);
> -
> /*
> * Handle user request to enter kernel debugger.
> */
> @@ -694,7 +692,7 @@ zs_abort(cs)
> extern int db_active;
>
> if (!db_active)
> - Debugger();
> + db_enter();
> else
> /* Debugger is probably hozed */
> callrom();
> Index: arch/sparc64/sparc64/autoconf.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/autoconf.c,v
> retrieving revision 1.127
> diff -u -p -r1.127 autoconf.c
> --- arch/sparc64/sparc64/autoconf.c 18 Oct 2016 00:43:57 -0000 1.127
> +++ arch/sparc64/sparc64/autoconf.c 30 Apr 2017 13:14:05 -0000
> @@ -582,7 +582,7 @@ bootpath_build(void)
> /* specialties */
> if (*cp == 'd') {
> #if defined(DDB)
> - Debugger();
> + db_enter();
> #else
> printf("kernel has no debugger\n");
> #endif
> Index: arch/sparc64/sparc64/clock.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/clock.c,v
> retrieving revision 1.58
> diff -u -p -r1.58 clock.c
> --- arch/sparc64/sparc64/clock.c 7 Mar 2016 13:21:51 -0000 1.58
> +++ arch/sparc64/sparc64/clock.c 30 Apr 2017 13:14:07 -0000
> @@ -740,7 +740,7 @@ clockintr(cap)
> "tick_base %llx\n", (long long)t, (long long)clk,
> (long long)tk, (long long)tick_base);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> tick_base = 0;
> }
> Index: arch/sparc64/sparc64/db_interface.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/db_interface.c,v
> retrieving revision 1.47
> diff -u -p -r1.47 db_interface.c
> --- arch/sparc64/sparc64/db_interface.c 7 Nov 2016 00:26:33 -0000
> 1.47
> +++ arch/sparc64/sparc64/db_interface.c 30 Apr 2017 13:20:07 -0000
> @@ -573,7 +573,7 @@ db_write_bytes(addr, size, data)
> }
>
> void
> -Debugger(void)
> +db_enter(void)
> {
> /* We use the breakpoint to trap into DDB */
> asm("ta 1; nop");
> Index: arch/sparc64/sparc64/intr.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/intr.c,v
> retrieving revision 1.55
> diff -u -p -r1.55 intr.c
> --- arch/sparc64/sparc64/intr.c 13 Jun 2016 01:08:13 -0000 1.55
> +++ arch/sparc64/sparc64/intr.c 30 Apr 2017 13:14:09 -0000
> @@ -109,7 +109,7 @@ strayintr(const struct trapframe64 *fp,
> nstray = 1;
> }
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
>
> @@ -213,7 +213,7 @@ intr_establish(int level, struct intrhan
> if (!ih->ih_number) {
> printf("\nintr_establish: NULL vector fun %p arg %p pil %p",
> ih->ih_fun, ih->ih_arg, ih->ih_number, ih->ih_pil);
> - Debugger();
> + db_enter();
> }
> #endif
>
> Index: arch/sparc64/sparc64/lock_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/lock_machdep.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 lock_machdep.c
> --- arch/sparc64/sparc64/lock_machdep.c 4 Apr 2017 12:30:04 -0000
> 1.13
> +++ arch/sparc64/sparc64/lock_machdep.c 30 Apr 2017 13:14:11 -0000
> @@ -100,7 +100,7 @@ __mp_lock_spin(struct __mp_lock *mpl, u_
>
> if (--nticks <= 0) {
> db_printf("__mp_lock(%p): lock spun out", mpl);
> - Debugger();
> + db_enter();
> nticks = __mp_lock_spinout;
> }
> }
> Index: arch/sparc64/sparc64/locore.s
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/locore.s,v
> retrieving revision 1.184
> diff -u -p -r1.184 locore.s
> --- arch/sparc64/sparc64/locore.s 18 Oct 2016 00:43:57 -0000 1.184
> +++ arch/sparc64/sparc64/locore.s 30 Apr 2017 13:14:21 -0000
> @@ -83,7 +83,7 @@
> #undef FPPROC
>
> /* Let us use same syntax as C code */
> -#define Debugger() ta 1; nop
> +#define db_enter() ta 1; nop
>
> /* use as needed to align things on longword boundaries */
> #define _ALIGN .align 8
> @@ -2882,7 +2882,7 @@ sun4v_tl1_ptbl_miss:
> be,pn %icc, ufill_trap
> nop
>
> - Debugger()
> + db_enter()
> NOTREACHED
>
> flush_others:
> @@ -3274,7 +3274,7 @@ pcbspill:
> NOTREACHED
>
> pcbspill_fail:
> - Debugger()
> + db_enter()
> NOTREACHED
>
>
> @@ -3858,7 +3858,7 @@ interrupt_vector:
>
> jmpl %g2, %g0
> nop
> - Debugger()
> + db_enter()
> NOTREACHED
> #else
> bgeu,pn %xcc, 3f
> Index: arch/sparc64/sparc64/pmap.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/pmap.c,v
> retrieving revision 1.98
> diff -u -p -r1.98 pmap.c
> --- arch/sparc64/sparc64/pmap.c 15 Sep 2016 02:00:17 -0000 1.98
> +++ arch/sparc64/sparc64/pmap.c 30 Apr 2017 13:14:26 -0000
> @@ -58,9 +58,9 @@
> #include <ddb/db_extern.h>
> #include <ddb/db_access.h>
> #include <ddb/db_output.h>
> -#define Debugger() __asm volatile("ta 1; nop");
> +#define db_enter() __asm volatile("ta 1; nop");
> #else
> -#define Debugger()
> +#define db_enter()
> #define db_printf printf
> #endif
>
> @@ -1526,7 +1526,7 @@ pmap_release(struct pmap *pm)
> if (pv != NULL) {
> printf("pmap_release:
> pm=%p page %llx still in use\n", pm,
> (unsigned long
> long)(((u_int64_t)i<<STSHIFT)|((u_int64_t)k<<PDSHIFT)|((u_int64_t)j<<PTSHIFT)));
> - Debugger();
> + db_enter();
> }
> }
> stxa(pdirentp, ASI_PHYS_CACHED, 0);
> @@ -1749,7 +1749,7 @@ pmap_kremove(vaddr_t va, vsize_t size)
> /* We need to flip the valid bit and clear the access
> statistics. */
> if (pseg_set(pm, va, 0, 0)) {
> printf("pmap_kremove: gotten pseg empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
>
> @@ -1931,7 +1931,7 @@ pmap_remove(struct pmap *pm, vaddr_t va,
> /* We need to flip the valid bit and clear the access
> statistics. */
> if (pseg_set(pm, va, 0, 0)) {
> printf("pmap_remove: gotten pseg empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> atomic_dec_long(&pm->pm_stats.resident_count);
> @@ -2017,7 +2017,7 @@ pmap_protect(struct pmap *pm, vaddr_t sv
> KDASSERT((data & TLB_NFO) == 0);
> if (pseg_set(pm, sva, data, 0)) {
> printf("pmap_protect: gotten pseg empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
>
> @@ -2274,7 +2274,7 @@ pmap_clear_modify(struct vm_page *pg)
> KDASSERT((data & TLB_NFO) == 0);
> if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, data,
> 0)) {
> printf("pmap_clear_modify: gotten pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> if (pv->pv_pmap->pm_ctx || pv->pv_pmap ==
> pmap_kernel()) {
> @@ -2325,7 +2325,7 @@ pmap_clear_reference(struct vm_page *pg)
> KDASSERT((data & TLB_NFO) == 0);
> if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, data,
> 0)) {
> printf("pmap_clear_reference: gotten pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> if (pv->pv_pmap->pm_ctx || pv->pv_pmap ==
> pmap_kernel()) {
> @@ -2446,7 +2446,7 @@ pmap_unwire(struct pmap *pmap, vaddr_t v
>
> if (pseg_set(pmap, va & PV_VAMASK, data, 0)) {
> printf("pmap_unwire: gotten pseg empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> mtx_leave(&pmap->pm_mtx);
> @@ -2501,7 +2501,7 @@ pmap_page_protect(struct vm_page *pg, vm
> KDASSERT((data & TLB_NFO) == 0);
> if (pseg_set(pv->pv_pmap, pv->pv_va &
> PV_VAMASK, data, 0)) {
> printf("pmap_page_protect: gotten pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> if (pv->pv_pmap->pm_ctx || pv->pv_pmap ==
> pmap_kernel()) {
> @@ -2529,7 +2529,7 @@ pmap_page_protect(struct vm_page *pg, vm
> /* Clear mapping */
> if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, 0, 0))
> {
> printf("pmap_page_protect: gotten pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> if (pv->pv_pmap->pm_ctx || pv->pv_pmap ==
> pmap_kernel()) {
> @@ -2556,7 +2556,7 @@ pmap_page_protect(struct vm_page *pg, vm
> pv->pv_va |= pmap_tte2flags(data);
> if (pseg_set(pv->pv_pmap, pv->pv_va & PV_VAMASK, 0, 0))
> {
> printf("pmap_page_protect: gotten pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> if (pv->pv_pmap->pm_ctx || pv->pv_pmap ==
> pmap_kernel()) {
> @@ -2647,7 +2647,7 @@ ctx_free(struct pmap *pm)
> "ctxbusy[%d] = %p, pm(%p)->pm_ctx = %p\n",
> oldctx, (void *)(u_long)ctxbusy[oldctx], pm,
> (void *)(u_long)pm->pm_physaddr);
> - Debugger();
> + db_enter();
> }
> #endif
> /* We should verify it has not been stolen and reallocated... */
> @@ -2820,7 +2820,7 @@ pmap_page_cache(struct pmap *pm, paddr_t
> pseg_get(pv->pv_pmap, va) &
> ~(SUN4U_TLB_CV|SUN4U_TLB_CP),
> 0)) {
> printf("pmap_page_cache: aliased pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> } else if (mode && (!(pv->pv_va & PV_NVC))) {
> @@ -2828,7 +2828,7 @@ pmap_page_cache(struct pmap *pm, paddr_t
> if (pseg_set(pv->pv_pmap, va,
> pseg_get(pv->pv_pmap, va) | SUN4U_TLB_CV, 0)) {
> printf("pmap_page_cache: aliased pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> } else {
> @@ -2836,7 +2836,7 @@ pmap_page_cache(struct pmap *pm, paddr_t
> if (pseg_set(pv->pv_pmap, va,
> pseg_get(pv->pv_pmap, va) & ~SUN4U_TLB_CV, 0)) {
> printf("pmap_page_cache: aliased pseg
> empty!\n");
> - Debugger();
> + db_enter();
> /* panic? */
> }
> }
> Index: arch/sparc64/sparc64/vm_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/sparc64/vm_machdep.c,v
> retrieving revision 1.36
> diff -u -p -r1.36 vm_machdep.c
> --- arch/sparc64/sparc64/vm_machdep.c 12 Feb 2017 04:55:08 -0000 1.36
> +++ arch/sparc64/sparc64/vm_machdep.c 30 Apr 2017 13:14:32 -0000
> @@ -264,7 +264,7 @@ cpu_fork(struct proc *p1, struct proc *p
> printf("cpu_fork: tstate=%lx pc=%lx npc=%lx rsp=%lx\n",
> (long)tf2->tf_tstate, (long)tf2->tf_pc, (long)tf2->tf_npc,
> (long)(tf2->tf_out[6]));
> - Debugger();
> + db_enter();
> #endif
> }
>
> Index: ddb/db_usrreq.c
> ===================================================================
> RCS file: /cvs/src/sys/ddb/db_usrreq.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 db_usrreq.c
> --- ddb/db_usrreq.c 4 Sep 2016 09:22:29 -0000 1.18
> +++ ddb/db_usrreq.c 30 Apr 2017 13:14:36 -0000
> @@ -96,7 +96,7 @@ ddb_sysctl(int *name, u_int namelen, voi
> if (securelevel < 1 ||
> (pr->ps_flags & PS_CONTROLT && cn_tab &&
> cn_tab->cn_dev == pr->ps_session->s_ttyp->t_dev)) {
> - Debugger();
> + db_enter();
> newp = NULL;
> } else
> return (ENODEV);
> Index: dev/ic/aic6250.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/aic6250.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 aic6250.c
> --- dev/ic/aic6250.c 23 Oct 2013 10:07:14 -0000 1.2
> +++ dev/ic/aic6250.c 30 Apr 2017 13:14:48 -0000
> @@ -126,7 +126,7 @@
> #include <dev/ic/aic6250var.h>
>
> #ifndef DDB
> -#define Debugger() panic("should call debugger here (aic6250.c)")
> +#define db_enter() panic("should call debugger here (aic6250.c)")
> #endif /* ! DDB */
>
> #ifdef AIC_DEBUG
> Index: dev/ic/aic6250var.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/aic6250var.h,v
> retrieving revision 1.2
> diff -u -p -r1.2 aic6250var.h
> --- dev/ic/aic6250var.h 23 Oct 2013 10:07:14 -0000 1.2
> +++ dev/ic/aic6250var.h 30 Apr 2017 13:14:42 -0000
> @@ -206,13 +206,13 @@ struct aic6250_softc {
> #define AIC_DOBREAK 0x40
> #define AIC_PRINT(b, s) do {if ((aic6250_debug & (b)) != 0) printf s;}
> while (0)
> #define AIC_BREAK() \
> - do { if ((aic6250_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
> + do { if ((aic6250_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
> #define AIC_ASSERT(x) \
> do { \
> if (!(x)) { \
> printf("%s at line %d: assertion failed\n", \
> sc->sc_dev.dv_xname, __LINE__); \
> - Debugger(); \
> + db_enter(); \
> } \
> } while (0)
> #else
> Index: dev/ic/aic6360.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/aic6360.c,v
> retrieving revision 1.27
> diff -u -p -r1.27 aic6360.c
> --- dev/ic/aic6360.c 14 Sep 2014 14:17:24 -0000 1.27
> +++ dev/ic/aic6360.c 30 Apr 2017 13:15:04 -0000
> @@ -145,7 +145,7 @@
> #include <dev/ic/aic6360var.h>
>
> #ifndef DDB
> -#define Debugger() panic("should call debugger here (aic6360.c)")
> +#define db_enter() panic("should call debugger here (aic6360.c)")
> #endif /* ! DDB */
>
> #ifdef AIC_DEBUG
> Index: dev/ic/aic6360var.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/aic6360var.h,v
> retrieving revision 1.8
> diff -u -p -r1.8 aic6360var.h
> --- dev/ic/aic6360var.h 6 Apr 2011 18:14:35 -0000 1.8
> +++ dev/ic/aic6360var.h 30 Apr 2017 13:14:53 -0000
> @@ -194,13 +194,13 @@ struct aic_softc {
> #define AIC_DOBREAK 0x40
> #define AIC_PRINT(b, s) do {if ((aic_debug & (b)) != 0) printf s;}
> while (0)
> #define AIC_BREAK() \
> - do { if ((aic_debug & AIC_DOBREAK) != 0) Debugger(); } while (0)
> + do { if ((aic_debug & AIC_DOBREAK) != 0) db_enter(); } while (0)
> #define AIC_ASSERT(x) \
> do { \
> if (!(x)) { \
> printf("%s at line %d: assertion failed\n", \
> sc->sc_dev.dv_xname, __LINE__); \
> - Debugger(); \
> + db_enter(); \
> } \
> } while (0)
> #else
> Index: dev/ic/com.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/com.c,v
> retrieving revision 1.162
> diff -u -p -r1.162 com.c
> --- dev/ic/com.c 30 Apr 2017 13:04:49 -0000 1.162
> +++ dev/ic/com.c 30 Apr 2017 13:15:08 -0000
> @@ -1088,7 +1088,7 @@ comintr(void *arg)
> if (ISSET(sc->sc_hwflags,
> COM_HW_CONSOLE)) {
> if (db_console)
> - Debugger();
> + db_enter();
> goto next;
> }
> #endif
> Index: dev/ic/ncr5380sbc.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/ncr5380sbc.c,v
> retrieving revision 1.32
> diff -u -p -r1.32 ncr5380sbc.c
> --- dev/ic/ncr5380sbc.c 15 Jan 2015 17:54:14 -0000 1.32
> +++ dev/ic/ncr5380sbc.c 30 Apr 2017 13:15:12 -0000
> @@ -122,7 +122,7 @@ void ncr5380_cmd_timeout(void *);
>
> #ifndef DDB
> /* This is used only in recoverable places. */
> -#define Debugger() printf("Debug: ncr5380.c:%d\n", __LINE__)
> +#define db_enter() printf("Debug: ncr5380.c:%d\n", __LINE__)
> #endif
>
> #ifdef NCR5380_DEBUG
> @@ -133,7 +133,7 @@ int ncr5380_debug = NCR_DBG_BREAK|NCR_DB
> struct ncr5380_softc *ncr5380_debug_sc;
>
> #define NCR_BREAK() \
> - do { if (ncr5380_debug & NCR_DBG_BREAK) Debugger(); } while (0)
> + do { if (ncr5380_debug & NCR_DBG_BREAK) db_enter(); } while (0)
>
> static void ncr5380_show_scsi_cmd(struct scsi_xfer *);
> static void ncr5380_show_sense(struct scsi_xfer *);
> Index: dev/ic/osiop.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/osiop.c,v
> retrieving revision 1.50
> diff -u -p -r1.50 osiop.c
> --- dev/ic/osiop.c 19 Dec 2014 07:23:57 -0000 1.50
> +++ dev/ic/osiop.c 30 Apr 2017 13:15:20 -0000
> @@ -596,7 +596,7 @@ osiop_scsidone(acb, status)
> if (acb == NULL || acb->xs == NULL) {
> printf("osiop_scsidone: NULL acb %p or scsi_xfer\n", acb);
> #if defined(OSIOP_DEBUG) && defined(DDB)
> - Debugger();
> + db_enter();
> #endif
> return;
> }
> @@ -1126,7 +1126,7 @@ osiop_checkintr(sc, istat, dstat, sstat0
> scraddr, scraddr + sizeof(osiop_script));
> printf(" istat %x dstat %x sstat0 %x\n", istat, dstat, sstat0);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> }
> #endif
> @@ -1294,7 +1294,7 @@ osiop_checkintr(sc, istat, dstat, sstat0
> osiop_read_1(sc, OSIOP_SBCL),
> osiop_read_4(sc, OSIOP_DSP));
> #if defined(OSIOP_DEBUG) && defined(DDB)
> - /*Debugger(); XXX is*/
> + /*db_enter(); XXX is*/
> #endif
> }
> switch (OSIOP_PHASE(osiop_read_1(sc, OSIOP_SBCL))) {
> @@ -1473,7 +1473,7 @@ osiop_checkintr(sc, istat, dstat, sstat0
> "curaddr %lx curlen %lx i %d\n",
> acb->curaddr, acb->curlen, i);
> #if defined(OSIOP_DEBUG) && defined(DDB)
> - Debugger();
> + db_enter();
> #endif
> }
> #ifdef OSIOP_DEBUG
> Index: dev/ic/wd33c93.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/wd33c93.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 wd33c93.c
> --- dev/ic/wd33c93.c 26 Dec 2016 17:38:14 -0000 1.9
> +++ dev/ic/wd33c93.c 30 Apr 2017 13:15:17 -0000
> @@ -878,7 +878,7 @@ wd33c93_wait(struct wd33c93_softc *sc, u
> printf("wd33c93_wait: TIMEO @%d with asr=0x%x
> csr=0x%x\n",
> line, val, csr);
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
> #endif
> return(val); /* Maybe I should abort */
> @@ -2144,7 +2144,7 @@ wd33c93_nextstate(struct wd33c93_softc *
> sc->sc_dev.dv_xname, asr, csr);
>
> #ifdef DDB
> - Debugger();
> + db_enter();
> #endif
>
> SET_SBIC_control(sc, SBIC_CTL_EDI | SBIC_CTL_IDI);
> Index: dev/usb/dwc2/dwc2.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/usb/dwc2/dwc2.c,v
> retrieving revision 1.43
> diff -u -p -r1.43 dwc2.c
> --- dev/usb/dwc2/dwc2.c 10 Mar 2017 11:18:48 -0000 1.43
> +++ dev/usb/dwc2/dwc2.c 30 Apr 2017 13:15:24 -0000
> @@ -1361,7 +1361,7 @@ dwc2_worker(struct task *wk, void *priv)
> struct dwc2_softc *sc = priv;
> struct dwc2_hsotg *hsotg = sc->sc_hsotg;
>
> -/* Debugger(); */
> +/* db_enter(); */
> #if 0
> struct usbd_xfer *xfer = dwork->xfer;
> struct dwc2_xfer *dxfer = DWC2_XFER2DXFER(xfer);
> Index: dev/wscons/wskbd.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/wscons/wskbd.c,v
> retrieving revision 1.85
> diff -u -p -r1.85 wskbd.c
> --- dev/wscons/wskbd.c 11 Mar 2017 11:55:03 -0000 1.85
> +++ dev/wscons/wskbd.c 30 Apr 2017 13:15:29 -0000
> @@ -1504,7 +1504,7 @@ internal_command(struct wskbd_softc *sc,
> #ifdef DDB
> if (ksym == KS_Cmd_Debugger) {
> if (sc->sc_isconsole && db_console)
> - Debugger();
> + db_enter();
> /* discard this key (ddb discarded command modifiers) */
> *type = WSCONS_EVENT_KEY_UP;
> return (1);
> @@ -1542,7 +1542,7 @@ internal_command(struct wskbd_softc *sc,
> #ifdef DDB
> case 2:
> if (sc->sc_isconsole && db_console)
> - Debugger();
> + db_enter();
> /* discard this key (ddb discarded command modifiers) */
> *type = WSCONS_EVENT_KEY_UP;
> break;
> Index: kern/kern_sched.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/kern_sched.c,v
> retrieving revision 1.45
> diff -u -p -r1.45 kern_sched.c
> --- kern/kern_sched.c 12 Feb 2017 04:55:08 -0000 1.45
> +++ kern/kern_sched.c 30 Apr 2017 13:55:26 -0000
> @@ -444,9 +444,10 @@ sched_choosecpu(struct proc *p)
> cpuset_del(&set, ci);
> }
>
> - if (p->p_cpu != choice)
> + if (p->p_cpu != choice) {
> sched_nmigrations++;
> - else
> + p->p_ru.ru_ixrss++;
> + } else
> sched_nomigrations++;
>
> return (choice);
> @@ -502,6 +503,7 @@ sched_steal_proc(struct cpu_info *self)
> best->p_cpu = self;
>
> sched_stolen++;
> + best->p_ru.ru_ixrss++;
> #endif
> return (best);
> }
> Index: kern/subr_prf.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/subr_prf.c,v
> retrieving revision 1.90
> diff -u -p -r1.90 subr_prf.c
> --- kern/subr_prf.c 30 Apr 2017 13:04:49 -0000 1.90
> +++ kern/subr_prf.c 30 Apr 2017 13:15:34 -0000
> @@ -201,7 +201,7 @@ panic(const char *fmt, ...)
>
> #ifdef DDB
> if (db_panic)
> - Debugger();
> + db_enter();
> else
> db_stack_dump();
> #endif
> @@ -229,7 +229,7 @@ splassert_fail(int wantipl, int haveipl,
> case 3:
> #ifdef DDB
> db_stack_dump();
> - Debugger();
> + db_enter();
> #endif
> break;
> default:
> Index: kern/subr_userconf.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/subr_userconf.c,v
> retrieving revision 1.44
> diff -u -p -r1.44 subr_userconf.c
> --- kern/subr_userconf.c 11 Sep 2015 07:13:58 -0000 1.44
> +++ kern/subr_userconf.c 30 Apr 2017 13:15:39 -0000
> @@ -1256,7 +1256,7 @@ userconf_parse(char *cmd)
> break;
> #if defined(DDB)
> case 'D':
> - Debugger();
> + db_enter();
> break;
> #endif
> case 'd':
> Index: kern/subr_witness.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/subr_witness.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 subr_witness.c
> --- kern/subr_witness.c 20 Apr 2017 12:59:36 -0000 1.1
> +++ kern/subr_witness.c 30 Apr 2017 13:15:51 -0000
> @@ -2521,5 +2521,5 @@ witness_debugger(int cond, const char *m
> if (!cond)
> return;
>
> - Debugger();
> + db_enter();
> }
> Index: sys/systm.h
> ===================================================================
> RCS file: /cvs/src/sys/sys/systm.h,v
> retrieving revision 1.127
> diff -u -p -r1.127 systm.h
> --- sys/systm.h 30 Apr 2017 13:04:49 -0000 1.127
> +++ sys/systm.h 30 Apr 2017 13:19:25 -0000
> @@ -340,7 +340,7 @@ extern int (*mountroot)(void);
>
> #if defined(DDB)
> /* debugger entry points */
> -void Debugger(void); /* in DDB only */
> +void db_enter(void); /* in DDB only */
> #endif
>
> #ifdef BOOT_CONFIG
>
>
