summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/dev/consinit.c4
-rw-r--r--sys/arch/sparc64/dev/fd.c4
-rw-r--r--sys/arch/sparc64/dev/iommu.c14
-rw-r--r--sys/arch/sparc64/dev/pcons.c4
-rw-r--r--sys/arch/sparc64/dev/sab.c4
-rw-r--r--sys/arch/sparc64/dev/sbbc.c4
-rw-r--r--sys/arch/sparc64/dev/vcons.c4
-rw-r--r--sys/arch/sparc64/dev/viommu.c6
-rw-r--r--sys/arch/sparc64/dev/zs.c6
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c4
-rw-r--r--sys/arch/sparc64/sparc64/clock.c4
-rw-r--r--sys/arch/sparc64/sparc64/db_interface.c4
-rw-r--r--sys/arch/sparc64/sparc64/intr.c6
-rw-r--r--sys/arch/sparc64/sparc64/lock_machdep.c4
-rw-r--r--sys/arch/sparc64/sparc64/locore.s10
-rw-r--r--sys/arch/sparc64/sparc64/pmap.c34
-rw-r--r--sys/arch/sparc64/sparc64/vm_machdep.c4
17 files changed, 59 insertions, 61 deletions
diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c
index 89d7c6878dc..5fcb870620f 100644
--- a/sys/arch/sparc64/dev/consinit.c
+++ b/sys/arch/sparc64/dev/consinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: consinit.c,v 1.15 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: consinit.c,v 1.16 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: consinit.c,v 1.9 2000/10/20 05:32:35 mrg Exp $ */
/*-
@@ -111,7 +111,7 @@ prom_cngetc(dev_t dev)
#ifdef DDB
if (ch == '+') {
if (nplus++ > 3)
- Debugger();
+ db_enter();
} else
nplus = 0;
#endif
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index f79ec2a59e5..8c48b4ee12d 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.46 2016/06/07 06:37:33 dlg Exp $ */
+/* $OpenBSD: fd.c,v 1.47 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
@@ -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
}
}
diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c
index 66316b1844c..b2f02f8f541 100644
--- a/sys/arch/sparc64/dev/iommu.c
+++ b/sys/arch/sparc64/dev/iommu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iommu.c,v 1.73 2016/05/04 18:26:12 kettenis Exp $ */
+/* $OpenBSD: iommu.c,v 1.74 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
@@ -774,7 +774,7 @@ iommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
(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_dma_tag_t t0, bus_dmamap_t map,
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, bus_dma_tag_t t0, bus_dmamap_t map,
"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, bus_dma_tag_t t0, bus_dmamap_t map,
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, bus_dma_tag_t t0, bus_dmamap_t map)
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 t, struct iommu_state *is,
iommu_dvmamap_print_map(t, is, map);
#if defined(DDB) && defined(DEBUG)
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#endif
}
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index b447fc33d2d..a195e9cd5bc 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcons.c,v 1.21 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: pcons.c,v 1.22 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */
/*-
@@ -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
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index 000003495ec..feb9de16f45 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sab.c,v 1.31 2013/05/30 16:15:01 deraadt Exp $ */
+/* $OpenBSD: sab.c,v 1.32 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -1398,7 +1398,7 @@ sabtty_abort(sc)
if (db_console == 0)
return;
if (db_active == 0)
- Debugger();
+ db_enter();
else
callrom();
#else
diff --git a/sys/arch/sparc64/dev/sbbc.c b/sys/arch/sparc64/dev/sbbc.c
index c2a9c4f4535..eb4b2bd8444 100644
--- a/sys/arch/sparc64/dev/sbbc.c
+++ b/sys/arch/sparc64/dev/sbbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbbc.c,v 1.11 2012/10/20 12:00:33 miod Exp $ */
+/* $OpenBSD: sbbc.c,v 1.12 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
@@ -424,7 +424,7 @@ sbbc_intr_cons(struct sbbc_softc *sc, uint32_t reason)
#ifdef DDB
if ((reason & SBBC_SRAM_CONS_BRK) && sc == sbbc_cons_input) {
if (db_console)
- Debugger();
+ db_enter();
}
#endif
diff --git a/sys/arch/sparc64/dev/vcons.c b/sys/arch/sparc64/dev/vcons.c
index da5465685f5..213a134cc1c 100644
--- a/sys/arch/sparc64/dev/vcons.c
+++ b/sys/arch/sparc64/dev/vcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vcons.c,v 1.14 2014/05/10 11:49:31 kettenis Exp $ */
+/* $OpenBSD: vcons.c,v 1.15 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis
*
@@ -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);
diff --git a/sys/arch/sparc64/dev/viommu.c b/sys/arch/sparc64/dev/viommu.c
index 77362d76eeb..4ded11671eb 100644
--- a/sys/arch/sparc64/dev/viommu.c
+++ b/sys/arch/sparc64/dev/viommu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viommu.c,v 1.17 2016/05/04 18:26:12 kettenis Exp $ */
+/* $OpenBSD: viommu.c,v 1.18 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */
/*
@@ -384,7 +384,7 @@ viommu_dvmamap_load(bus_dma_tag_t t, bus_dma_tag_t t0, bus_dmamap_t map,
(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, bus_dma_tag_t t0, bus_dmamap_t map,
"failed!\n", (int)sgsize, flags);
#ifdef DDB
if (iommudebug & IDB_BREAK)
- Debugger();
+ db_enter();
#else
panic("");
#endif
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index 5c2668a09b8..8b105b7276b 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.28 2017/04/30 13:04:49 mpi Exp $ */
+/* $OpenBSD: zs.c,v 1.29 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -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();
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index a4bc40bcad2..1a9f711f535 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.127 2016/10/18 00:43:57 guenther Exp $ */
+/* $OpenBSD: autoconf.c,v 1.128 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -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
diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index e33aa021f2f..3b053f96023 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.58 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: clock.c,v 1.59 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
/*
@@ -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;
}
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index eb84bb99838..f578bd1a554 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.47 2016/11/07 00:26:33 guenther Exp $ */
+/* $OpenBSD: db_interface.c,v 1.48 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
/*
@@ -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");
diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c
index 2947715d45b..f82f6427c28 100644
--- a/sys/arch/sparc64/sparc64/intr.c
+++ b/sys/arch/sparc64/sparc64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.55 2016/06/13 01:08:13 dlg Exp $ */
+/* $OpenBSD: intr.c,v 1.56 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */
/*
@@ -109,7 +109,7 @@ strayintr(const struct trapframe64 *fp, int vectored)
nstray = 1;
}
#ifdef DDB
- Debugger();
+ db_enter();
#endif
}
@@ -213,7 +213,7 @@ intr_establish(int level, struct intrhand *ih)
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
diff --git a/sys/arch/sparc64/sparc64/lock_machdep.c b/sys/arch/sparc64/sparc64/lock_machdep.c
index 0cb1d16b66e..38de1567201 100644
--- a/sys/arch/sparc64/sparc64/lock_machdep.c
+++ b/sys/arch/sparc64/sparc64/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.13 2017/04/04 12:30:04 visa Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.14 2017/04/30 16:45:45 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -100,7 +100,7 @@ __mp_lock_spin(struct __mp_lock *mpl, u_int me)
if (--nticks <= 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
- Debugger();
+ db_enter();
nticks = __mp_lock_spinout;
}
}
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index 3ae0dadbb1b..c0779d31cf7 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.184 2016/10/18 00:43:57 guenther Exp $ */
+/* $OpenBSD: locore.s,v 1.185 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */
/*
@@ -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
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index c8954c3ecfc..2ff45660e03 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.98 2016/09/15 02:00:17 dlg Exp $ */
+/* $OpenBSD: pmap.c,v 1.99 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
/*
@@ -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, vaddr_t endva)
/* 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 sva, vaddr_t eva, vm_prot_t prot)
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 va)
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_prot_t prot)
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_prot_t prot)
/* 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_prot_t prot)
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 pa, int mode)
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 pa, int mode)
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 pa, int mode)
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? */
}
}
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index 18e012ed879..ac3f4514e83 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.36 2017/02/12 04:55:08 guenther Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.37 2017/04/30 16:45:45 mpi Exp $ */
/* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */
/*
@@ -264,7 +264,7 @@ cpu_fork(struct proc *p1, struct proc *p2, void *stack, void *tcb,
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
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:07:21 +0000