diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-04 19:12:55 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-04 19:12:55 +0000 |
| commit | b466ec76ccaa19efb6b491867144cf8ace531492 (patch) | |
| tree | ad21e26b3070587164d2c819056a9e8ebba46549 /sys/arch | |
| parent | ac32dc7d982b2441b52a463f0a715d478dc74e43 (diff) | |
Remove gdb waitcount debug code and dummy print.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/machdep.c | 39 | ||||
| -rw-r--r-- | sys/arch/arm64/arm64/pmap.c | 7 |
2 files changed, 2 insertions, 44 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c index 8d38a4d6604..f126558ccba 100644 --- a/sys/arch/arm64/arm64/machdep.c +++ b/sys/arch/arm64/arm64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.7 2017/01/23 14:02:02 jsg Exp $ */ +/* $OpenBSD: machdep.c,v 1.8 2017/02/04 19:12:54 patrick Exp $ */ /* * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se> * @@ -761,8 +761,6 @@ install_coproc_handler() void collect_kernel_args(char *); void process_kernel_args(void); -volatile int gdb_wc, gdb_w; - void initarm(struct arm64_bootparams *abp) { @@ -780,11 +778,6 @@ initarm(struct arm64_bootparams *abp) int (*map_a4x_func_save)(bus_space_tag_t, bus_addr_t, bus_size_t, int, bus_space_handle_t *); -#if 0 - gdb_w = 1; - while(gdb_w) - ; -#endif // NOTE that 1GB of ram is mapped in by default in // the bootstrap memory config, so nothing is necessary // until pmap_bootstrap_finalize is called?? @@ -845,12 +838,6 @@ initarm(struct arm64_bootparams *abp) } process_kernel_args(); - if (gdb_wc >= 0) { - gdb_w = 1; - while(gdb_w) - ; - } - // PCPU_SET(curthread, &thread0); /* Do basic tuning, hz etc */ @@ -1036,11 +1023,6 @@ process_kernel_args(void) case 's': fl |= RB_SINGLE; break; -// hack - case 'g': - gdb_wc = 0; - break; -// hack case '1': comcnspeed = B115200; break; @@ -1054,25 +1036,6 @@ process_kernel_args(void) boothowto |= fl; } } -volatile int gdb_wc=-1; -int gdb_c=0; -void dbg(int index, long arg0, long arg1) -{ - if (gdb_wc > 0) { - gdb_wc--; - } - if (gdb_wc==-1) { - gdb_c++; - } - if (gdb_wc == 0) - gdb_w = 1; - while(gdb_w) - ; -} -void prt(char *fmt, long arg0, long arg1, long arg2) -{ -} - /* * allow bootstrap to steal KVA after machdep has given it back to pmap. diff --git a/sys/arch/arm64/arm64/pmap.c b/sys/arch/arm64/arm64/pmap.c index aff6d325409..392926ffb4f 100644 --- a/sys/arch/arm64/arm64/pmap.c +++ b/sys/arch/arm64/arm64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.12 2017/02/03 09:45:05 patrick Exp $ */ +/* $OpenBSD: pmap.c,v 1.13 2017/02/04 19:12:54 patrick Exp $ */ /* * Copyright (c) 2008-2009,2014-2016 Dale Rahn <drahn@dalerahn.com> * @@ -1164,7 +1164,6 @@ CTASSERT(sizeof(struct pmapvp0) == 8192); int mappings_allocated = 0; int pted_allocated = 0; -void prt(char *fmt, ...); vaddr_t pmap_bootstrap(long kvo, paddr_t lpt1, long kernelstart, long kernelend, @@ -1180,10 +1179,6 @@ pmap_bootstrap(long kvo, paddr_t lpt1, long kernelstart, long kernelend, int i, j, k; int lb_idx2, ub_idx2; - prt("format string"); - prt("does this %d work", 0); - prt("does this %d %d work", 5, 2); - pmap_setup_avail(ram_start, ram_end, kvo); /* in theory we could start with just the memory in the kernel, |