Date: Sun, 21 Mar 2004 20:13:34 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49507 for review Message-ID: <200403220413.i2M4DYJe005060@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49507 Change 49507 by marcel@marcel_nfs on 2004/03/21 20:13:00 Make sparc64 compile. Affected files ... .. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 edit .. //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 edit Differences ... ==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#4 (text+ko) ==== @@ -54,42 +54,11 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -int db_active; -db_regs_t ddb_regs; - -#if 0 -static jmp_buf db_global_jmpbuf; -static int db_global_jmpbuf_valid; - -int -ddb_trap(struct trapframe *tf) +void +db_cpu_trap(int type, int dummy, struct trapframe *tf) { - - if (db_global_jmpbuf_valid) - longjmp(db_global_jmpbuf, 1); flushw(); - ddb_regs = *tf; - critical_enter(); - setjmp(db_global_jmpbuf); - db_global_jmpbuf_valid = TRUE; - atomic_add_acq_int(&db_active, 1); -#ifdef SMP - stop_cpus(PCPU_GET(other_cpus)); -#endif - cndbctl(TRUE); - db_trap(tf->tf_type, 0); - cndbctl(FALSE); - db_active--; -#ifdef SMP - restart_cpus(stopped_cpus); -#endif - db_global_jmpbuf_valid = FALSE; - critical_exit(); - *tf = ddb_regs; - TF_DONE(tf); - return (1); } -#endif void db_read_bytes(vm_offset_t addr, size_t size, char *data) ==== //depot/projects/gdb/sys/sparc64/sparc64/mp_machdep.c#2 (text+ko) ==== @@ -55,11 +55,10 @@ * $FreeBSD: src/sys/sparc64/sparc64/mp_machdep.c,v 1.25 2003/12/03 14:57:25 jhb Exp $ */ -#include "opt_ddb.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> +#include <sys/kdb.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/mutex.h> @@ -76,8 +75,6 @@ #include <dev/ofw/openfirm.h> -#include <ddb/ddb.h> - #include <machine/asi.h> #include <machine/atomic.h> #include <machine/bus.h> @@ -446,8 +443,8 @@ return; } if ( -#ifdef DDB - db_active || +#ifdef KDB + kdb_active || #endif panicstr != NULL) printf("ipi_send: couldn't send ipi to module %u\n", mid);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403220413.i2M4DYJe005060>