From john@johnrshannon.com Tue May 18 14:55:34 2004 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACDE216A4CF for ; Tue, 18 May 2004 14:55:34 -0700 (PDT) Received: from mail.johnrshannon.com (mail.johnrshannon.com [69.20.159.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31F4F43DCB for ; Tue, 18 May 2004 10:57:01 -0700 (PDT) (envelope-from john@johnrshannon.com) Received: from localhost (localhost [127.0.0.1]) by mail.johnrshannon.com (Postfix) with ESMTP id E196D174FD for ; Tue, 18 May 2004 11:56:38 -0600 (MDT) Received: from mail.johnrshannon.com ([127.0.0.1]) by localhost (mail.johnrshannon.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 02039-04 for ; Tue, 18 May 2004 11:56:19 -0600 (MDT) Received: from pablo.internal.johnrshannon.com (pablo.internal.johnrshannon.com [192.168.1.34]) by mail.johnrshannon.com (Postfix) with ESMTP id D1B751748D for ; Tue, 18 May 2004 11:56:19 -0600 (MDT) Received: by pablo.internal.johnrshannon.com (Postfix, from userid 1001) id 09C70E6; Tue, 18 May 2004 11:56:20 -0600 (MDT) Message-Id: <20040518175620.09C70E6@pablo.internal.johnrshannon.com> Date: Tue, 18 May 2004 11:56:20 -0600 (MDT) From: John R.Shannon Reply-To: John R.Shannon To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Responding to request to not use cvs retrieval of distfiles X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 66832 >Category: ports >Synopsis: [MAINTAINER] devel/gdb53-act: Responding to request to not use cvs retrieval of distfiles >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 18 15:00:30 PDT 2004 >Closed-Date: Mon May 24 16:23:21 PDT 2004 >Last-Modified: Mon May 24 16:23:21 PDT 2004 >Originator: John R. Shannon >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: johnrshannon.com >Environment: System: FreeBSD pablo.internal.johnrshannon.com 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #3: Fri Feb 27 13:57:29 MST 2004 root@pablo.internal.johnrshannon.com:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: This port retrieved it's distfiles via CVS. This created problems on some machines located behind firewalls. To correct this, I made a distribution file and placed it on my http server. It would be nice if it could be mirrored as my server lacks the availability and bandwidth of a server located in a hosting center or ISP. >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # /usr/ports/devel/gdb53-act # /usr/ports/devel/gdb53-act/files # /usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_fbsd.mh # /usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_nm-fbsd.h # /usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_fbsd.mh # /usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_nm-fbsd.h # /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mh # /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mt # /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_nm-fbsd.h # /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_tm-fbsd.h # /usr/ports/devel/gdb53-act/files/patch-gdb_defs.h # /usr/ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c # /usr/ports/devel/gdb53-act/files/patch-gdb_i386-tdep.c # /usr/ports/devel/gdb53-act/files/patch-gdb_sparc-tdep.c # /usr/ports/devel/gdb53-act/files/patch-gdb_symfile.c # /usr/ports/devel/gdb53-act/files/patch-gdb_sparcnbsd-tdep.c # /usr/ports/devel/gdb53-act/files/patch-gdb_target.c # /usr/ports/devel/gdb53-act/files/patch-gdb_target.h # /usr/ports/devel/gdb53-act/files/patch-gdb_version.in # /usr/ports/devel/gdb53-act/files/patch-gdb_config_nm-fbsd.h # /usr/ports/devel/gdb53-act/files/patch-gdb_i386bsd-nat.c # /usr/ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c # /usr/ports/devel/gdb53-act/Makefile # /usr/ports/devel/gdb53-act/distinfo # /usr/ports/devel/gdb53-act/pkg-descr # /usr/ports/devel/gdb53-act/OLD-DIRS # echo c - /usr/ports/devel/gdb53-act mkdir -p /usr/ports/devel/gdb53-act > /dev/null 2>&1 echo c - /usr/ports/devel/gdb53-act/files mkdir -p /usr/ports/devel/gdb53-act/files > /dev/null 2>&1 echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_fbsd.mh sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_fbsd.mh << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_fbsd.mh' X--- gdb/config/alpha/fbsd.mh Sat Jan 19 17:12:50 2002 X+++ gdb/config/alpha/fbsd.mh Sun Oct 13 12:22:36 2002 X@@ -1,5 +1,6 @@ X # Host: FreeBSD/Alpha X NATDEPFILES= fork-child.o infptrace.o inftarg.o \ X solib.o solib-svr4.o solib-legacy.o \ X- corelow.o core-regset.o alphabsd-nat.o X+ corelow.o core-regset.o alphabsd-nat.o freebsd-uthread.o kvm-fbsd.o X NAT_FILE= nm-fbsd.h X+NAT_CLIBS= -lkvm END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_fbsd.mh echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_nm-fbsd.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_nm-fbsd.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_nm-fbsd.h' X--- gdb/config/alpha/nm-fbsd.h Tue Mar 6 00:21:21 2001 X+++ gdb/config/alpha/nm-fbsd.h Sun Oct 13 12:23:51 2002 X@@ -22,6 +22,8 @@ X #ifndef NM_FBSD_H X #define NM_FBSD_H X X+#include "config/nm-fbsd.h" X+ X /* Type of the third argument to the `ptrace' system call. */ X #define PTRACE_ARG3_TYPE caddr_t X END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_alpha_nm-fbsd.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_fbsd.mh sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_fbsd.mh << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_fbsd.mh' X--- gdb/config/i386/fbsd.mh Sat May 11 10:22:27 2002 X+++ gdb/config/i386/fbsd.mh Sun Oct 13 11:50:47 2002 X@@ -4,4 +4,6 @@ X X NAT_FILE= nm-fbsd.h X # NOTE: Do not spread NATDEPFILES over several lines - it hurts BSD make. X-NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o core-aout.o core-regset.o i386-nat.o i386bsd-nat.o i386fbsd-nat.o gcore.o fbsd-proc.o X+NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o solib-svr4.o solib-legacy.o corelow.o core-aout.o core-regset.o i386-nat.o i386bsd-nat.o i386fbsd-nat.o gcore.o fbsd-proc.o kvm-fbsd.o freebsd-uthread.o X+ X+NAT_CLIBS= -lkvm END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_fbsd.mh echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_nm-fbsd.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_nm-fbsd.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_nm-fbsd.h' X--- gdb/config/i386/nm-fbsd.h Fri Jun 28 11:44:49 2002 X+++ gdb/config/i386/nm-fbsd.h Sun Oct 13 10:53:27 2002 X@@ -26,6 +26,7 @@ X #define I386_USE_GENERIC_WATCHPOINTS X #endif X X+#include "config/nm-fbsd.h" X #include "i386/nm-i386.h" X X #ifdef HAVE_SYS_PARAM_H END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_i386_nm-fbsd.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mh sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mh << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mh' X--- gdb/config/sparc/fbsd.mh.orig Wed Mar 13 03:20:24 2002 X+++ gdb/config/sparc/fbsd.mh Thu Oct 17 05:59:25 2002 X@@ -19,7 +19,7 @@ X # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ X X # Host: FreeBSD/sparc64 X-NATDEPFILES= sparc-nat.o \ X- corelow.o fork-child.o infptrace.o inftarg.o \ X- solib.o solib-svr4.o solib-legacy.o X+NATDEPFILES= fork-child.o infptrace.o inftarg.o sparc64nbsd-nat.o \ X+ solib.o solib-svr4.o solib-legacy.o kvm-fbsd.o X NAT_FILE= nm-fbsd.h X+NAT_CLIBS= -lkvm END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mh echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mt sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mt << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mt' X--- gdb/config/sparc/fbsd.mt.orig Wed Mar 13 03:20:24 2002 X+++ gdb/config/sparc/fbsd.mt Thu Oct 17 05:59:59 2002 X@@ -19,5 +19,6 @@ X # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ X X # Target: FreeBSD/sparc64 X-TDEPFILES= sparc-tdep.o solib.o solib-svr4.o solib-legacy.o X+TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o corelow.o solib.o \ X+ solib-svr4.o solib-legacy.o X TM_FILE= tm-fbsd.h END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_fbsd.mt echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_nm-fbsd.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_nm-fbsd.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_nm-fbsd.h' X--- gdb/config/sparc/nm-fbsd.h.orig Fri Mar 1 18:35:24 2002 X+++ gdb/config/sparc/nm-fbsd.h Tue Oct 22 16:33:14 2002 X@@ -32,36 +32,45 @@ X #define ATTACH_DETACH X X X-/* Shared library support. */ X+#include "regcache.h" X+ X+/* Get generic FreeBSD native definitions. */ X+ X+#include "config/nm-fbsd.h" X+ X+/* Shared library support. */ X X #define SVR4_SHARED_LIBS X X #include "solib.h" /* Support for shared libraries. */ X #include "elf/common.h" /* Additional ELF shared library info. */ X X-/* Make things match up with what is expected in sparc-nat.c. */ X+/* Before storing, we need to read all the registers. */ X+ X+#define CHILD_PREPARE_TO_STORE() read_register_bytes (0, NULL, REGISTER_BYTES) X+ X+#define REG32_OFFSET_GLOBAL (0) X+#define REG32_OFFSET_OUT (32) X+#define REG32_OFFSET_NPC (96) X+#define REG32_OFFSET_PC (100) X+#define REG32_OFFSET_PSR (104) X+#define REG32_OFFSET_Y (112) X+#define REG32_SIZE (128) X+#define FPREG32_SIZE (136) X+ X+#define REG64_OFFSET_GLOBAL (0) X+#define REG64_OFFSET_OUT (64) X+#define REG64_OFFSET_NPC (192) X+#define REG64_OFFSET_PC (200) X+#define REG64_OFFSET_TSTATE (208) X+#define REG64_OFFSET_Y (224) X+#define REG64_SIZE (256) X+#define FPREG64_SIZE (272) X+ X+#define JB32_OFFSET_PC REG32_OFFSET_PC X+#define JB64_OFFSET_PC REG64_OFFSET_PC X X-#define PTRACE_GETREGS PT_GETREGS X-#define PTRACE_SETREGS PT_SETREGS X-#define PTRACE_GETFPREGS PT_GETFPREGS X-#define PTRACE_SETFPREGS PT_SETFPREGS X- X-#define GDB_GREGSET_T struct reg X-#define GDB_FPREGSET_T struct fpreg X- X-#define regs trapframe X-#define r_g1 tf_global[1] X-#define r_ps tf_tstate X-#define r_pc tf_tpc X-#define r_npc tf_tnpc X-#define r_y tf_y X- X-#define FPU_FSR_TYPE unsigned long X-#define fp_status fpreg /* our reg.h */ X-#define fpu fpreg /* our reg.h */ X-#define fpu_regs fr_regs /* one field of fpu_fr on Solaris */ X-#define fpu_fr fr_regs /* a union w/in struct fpu on Solaris */ X-#define fpu_fsr fr_fsr X-#define Fpu_fsr fr_fsr X+#define reg64 reg X+#define fpreg64 fpreg X X #endif /* NM_FBSD_H */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_nm-fbsd.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_tm-fbsd.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_tm-fbsd.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_tm-fbsd.h' X--- gdb/config/sparc/tm-fbsd.h.orig Fri Mar 1 18:35:24 2002 X+++ gdb/config/sparc/tm-fbsd.h Thu Oct 17 06:01:10 2002 X@@ -22,13 +22,7 @@ X #define TM_FBSD_H X X #define SVR4_SHARED_LIBS X+#include "sparc/tm-sp64.h" /* sets GDB_MULTI_ARCH */ X #include "solib.h" /* Support for shared libraries. */ X-#include "sparc/tm-sp64.h" X- X-/* Number of traps that happen between exec'ing the shell to run an X- inferior, and when we finally get to the inferior code. The X- default is right for FreeBSD. */ X- X-#undef START_INFERIOR_TRAPS_EXPECTED X X #endif /* TM_FBSD_H */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_sparc_tm-fbsd.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_defs.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_defs.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_defs.h' X--- gdb/defs.h Thu Aug 1 10:18:32 2002 X+++ gdb/defs.h Sun Oct 13 10:44:10 2002 X@@ -39,8 +39,6 @@ X #include X #endif X X-#include "gdb_locale.h" X- X /* For ``enum target_signal''. */ X #include "gdb/signals.h" X X@@ -57,6 +55,8 @@ X here and in all subsequent file inclusions. */ X X #include "ansidecl.h" X+ X+#include "gdb_locale.h" X X #include /* for va_list */ X END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_defs.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c' X--- gdb/freebsd-uthread.c Wed Dec 31 16:00:00 1969 X+++ gdb/freebsd-uthread.c Sun Oct 13 13:10:51 2002 X@@ -0,0 +1,934 @@ X+/* $FreeBSD: ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c,v 1.1 2003/09/27 07:38:23 edwin Exp $ */ X+/* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. X+ Copyright 1996, 1999 Free Software Foundation, Inc. X+ X+This file is part of GDB. X+ X+This program is free software; you can redistribute it and/or modify X+it under the terms of the GNU General Public License as published by X+the Free Software Foundation; either version 2 of the License, or X+(at your option) any later version. X+ X+This program is distributed in the hope that it will be useful, X+but WITHOUT ANY WARRANTY; without even the implied warranty of X+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the X+GNU General Public License for more details. X+ X+You should have received a copy of the GNU General Public License X+along with this program; if not, write to the Free Software X+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ X+ X+/* This module implements a sort of half target that sits between the X+ machine-independent parts of GDB and the ptrace interface (infptrace.c) to X+ provide access to the FreeBSD user-mode thread implementation. X+ X+ FreeBSD threads are true user-mode threads, which are invoked via X+ the pthread_* interfaces. These are mostly implemented in X+ user-space, with all thread context kept in various structures that X+ live in the user's heap. For the most part, the kernel has no X+ knowlege of these threads. X+ X+ Based largely on hpux-thread.c X+ X+ */ X+ X+ X+#include "defs.h" X+#include X+#include X+#include X+#include X+#include "gdbthread.h" X+#include "target.h" X+#include "inferior.h" X+#include X+#include X+#include X+#include X+#include "gdbcore.h" X+#include "regcache.h" X+ X+extern int child_suppress_run; X+extern struct target_ops child_ops; /* target vector for inftarg.c */ X+ X+extern void _initialize_freebsd_uthread PARAMS ((void)); X+ X+/* Set to true while we are part-way through attaching */ X+static int freebsd_uthread_attaching; X+ X+static int freebsd_uthread_active = 0; X+static CORE_ADDR P_thread_list; X+static CORE_ADDR P_thread_run; X+ X+/* Pointer to the next function on the objfile event chain. */ X+static void (*target_new_objfile_chain) (struct objfile *objfile); X+ X+static void freebsd_uthread_resume PARAMS ((ptid_t pid, int step, X+ enum target_signal signo)); X+ X+static void init_freebsd_uthread_ops PARAMS ((void)); X+ X+static struct target_ops freebsd_uthread_ops; X+ X+static ptid_t find_active_ptid PARAMS ((void)); X+ X+struct cached_pthread { X+ u_int64_t uniqueid; X+ int state; X+ CORE_ADDR name; X+ union { X+ ucontext_t uc; X+ jmp_buf jb; X+ } ctx; X+}; X+ X+static ptid_t cached_ptid; X+static struct cached_pthread cached_pthread; X+static CORE_ADDR cached_pthread_addr; X+ X+LIST_HEAD(idmaplist, idmap); X+ X+struct idmap { X+ LIST_ENTRY(idmap) link; X+ u_int64_t uniqueid; X+ int tid; X+}; X+ X+#define MAPHASH_SIZE 257 X+#define TID_MIN 1 X+#define TID_MAX 16383 X+ X+static int tid_to_hash[TID_MAX + 1]; /* set to map_hash index */ X+static struct idmaplist map_hash[MAPHASH_SIZE]; X+static int next_free_tid = TID_MIN; /* first available tid */ X+static int last_free_tid = TID_MIN; /* first unavailable */ X+ X+static CORE_ADDR P_thread_next_offset; X+static CORE_ADDR P_thread_uniqueid_offset; X+static CORE_ADDR P_thread_state_offset; X+static CORE_ADDR P_thread_name_offset; X+static CORE_ADDR P_thread_ctx_offset; X+static CORE_ADDR P_thread_PS_RUNNING_value; X+static CORE_ADDR P_thread_PS_DEAD_value; X+ X+static int next_offset; X+static int uniqueid_offset; X+static int state_offset; X+static int name_offset; X+static int ctx_offset; X+static int PS_RUNNING_value; X+static int PS_DEAD_value; X+ X+#define UNIQUEID_HASH(id) (id % MAPHASH_SIZE) X+#define TID_ADD1(tid) (((tid) + 1) == TID_MAX + 1 \ X+ ? TID_MIN : (tid) + 1) X+#define IS_TID_FREE(tid) (tid_to_hash[tid] == -1) X+ X+static int X+get_new_tid(int h) X+{ X+ int tid = next_free_tid; X+ X+ tid_to_hash[tid] = h; X+ next_free_tid = TID_ADD1(next_free_tid); X+ if (next_free_tid == last_free_tid) X+ { X+ int i; X+ X+ for (i = last_free_tid; TID_ADD1(i) != last_free_tid; i = TID_ADD1(i)) X+ if (IS_TID_FREE(i)) X+ break; X+ if (TID_ADD1(i) == last_free_tid) X+ { X+ error("too many threads"); X+ return 0; X+ } X+ next_free_tid = i; X+ for (i = TID_ADD1(i); IS_TID_FREE(i); i = TID_ADD1(i)) X+ ; X+ last_free_tid = i; X+ } X+ X+ return tid; X+} X+ X+static ptid_t X+find_ptid(u_int64_t uniqueid) X+{ X+ int h = UNIQUEID_HASH(uniqueid); X+ struct idmap *im; X+ X+ LIST_FOREACH(im, &map_hash[h], link) X+ if (im->uniqueid == uniqueid) X+ return MERGEPID(PIDGET(inferior_ptid), im->tid); X+ X+ im = xmalloc(sizeof(struct idmap)); X+ im->uniqueid = uniqueid; X+ im->tid = get_new_tid(h); X+ LIST_INSERT_HEAD(&map_hash[h], im, link); X+ X+ return MERGEPID(PIDGET(inferior_ptid), im->tid); X+} X+ X+static void X+free_ptid(ptid_t ptid) X+{ X+ int tid = TIDGET(ptid); X+ int h = tid_to_hash[tid]; X+ struct idmap *im; X+ X+ if (!tid) return; X+ X+ LIST_FOREACH(im, &map_hash[h], link) X+ if (im->tid == tid) X+ break; X+ X+ if (!im) return; X+ X+ LIST_REMOVE(im, link); X+ tid_to_hash[tid] = -1; X+ free(im); X+} X+ X+#define READ_OFFSET(field) read_memory(P_thread_##field##_offset, \ X+ (char *) &field##_offset, \ X+ sizeof(field##_offset)) X+ X+#define READ_VALUE(name) read_memory(P_thread_##name##_value, \ X+ (char *) &name##_value, \ X+ sizeof(name##_value)) X+ X+static void X+read_thread_offsets (void) X+{ X+ READ_OFFSET(next); X+ READ_OFFSET(uniqueid); X+ READ_OFFSET(state); X+ READ_OFFSET(name); X+ READ_OFFSET(ctx); X+ X+ READ_VALUE(PS_RUNNING); X+ READ_VALUE(PS_DEAD); X+} X+ X+#define READ_FIELD(ptr, T, field, result) \ X+ read_memory ((ptr) + field##_offset, (char *) &(result), sizeof result) X+ X+static u_int64_t X+read_pthread_uniqueid (CORE_ADDR ptr) X+{ X+ u_int64_t uniqueid; X+ READ_FIELD(ptr, u_int64_t, uniqueid, uniqueid); X+ return uniqueid; X+} X+ X+static CORE_ADDR X+read_pthread_next (CORE_ADDR ptr) X+{ X+ CORE_ADDR next; X+ READ_FIELD(ptr, CORE_ADDR, next, next); X+ return next; X+} X+ X+static void X+read_cached_pthread (CORE_ADDR ptr, struct cached_pthread *cache) X+{ X+ READ_FIELD(ptr, u_int64_t, uniqueid, cache->uniqueid); X+ READ_FIELD(ptr, int, state, cache->state); X+ READ_FIELD(ptr, CORE_ADDR, name, cache->name); X+ READ_FIELD(ptr, ucontext_t, ctx, cache->ctx); X+} X+ X+static ptid_t X+find_active_ptid (void) X+{ X+ CORE_ADDR ptr; X+ X+ read_memory ((CORE_ADDR)P_thread_run, X+ (char *)&ptr, X+ sizeof ptr); X+ X+ return find_ptid(read_pthread_uniqueid(ptr)); X+} X+ X+static CORE_ADDR find_pthread_addr PARAMS ((ptid_t ptid)); X+static struct cached_pthread * find_pthread PARAMS ((ptid_t ptid)); X+ X+static CORE_ADDR X+find_pthread_addr (ptid_t ptid) X+{ X+ CORE_ADDR ptr; X+ X+ if (ptid_equal(ptid, cached_ptid)) X+ return cached_pthread_addr; X+ X+ read_memory ((CORE_ADDR)P_thread_list, X+ (char *)&ptr, X+ sizeof ptr); X+ X+ while (ptr != 0) X+ { X+ if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) X+ { X+ cached_ptid = ptid; X+ cached_pthread_addr = ptr; X+ read_cached_pthread(ptr, &cached_pthread); X+ return ptr; X+ } X+ ptr = read_pthread_next(ptr); X+ } X+ X+ return NULL; X+} X+ X+static struct cached_pthread * X+find_pthread (ptid_t ptid) X+{ X+ CORE_ADDR ptr; X+ X+ if (ptid_equal(ptid, cached_ptid)) X+ return &cached_pthread; X+ X+ read_memory ((CORE_ADDR)P_thread_list, X+ (char *)&ptr, X+ sizeof ptr); X+ X+ while (ptr != 0) X+ { X+ if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) X+ { X+ cached_ptid = ptid; X+ cached_pthread_addr = ptr; X+ read_cached_pthread(ptr, &cached_pthread); X+ return &cached_pthread; X+ } X+ ptr = read_pthread_next(ptr); X+ } X+ X+#if 0 X+ error ("Can't find pthread %d,%d", PIDGET(ptid), TIDGET(ptid)); X+#endif X+ return NULL; X+} X+ X+ X+/* Most target vector functions from here on actually just pass through to X+ inftarg.c, as they don't need to do anything specific for threads. */ X+ X+/* ARGSUSED */ X+static void X+freebsd_uthread_open (char *arg, int from_tty) X+{ X+ child_ops.to_open (arg, from_tty); X+} X+ X+/* Attach to process PID, then initialize for debugging it X+ and wait for the trace-trap that results from attaching. */ X+ X+static void X+freebsd_uthread_attach (char *args, int from_tty) X+{ X+ child_ops.to_attach (args, from_tty); X+ push_target (&freebsd_uthread_ops); X+ freebsd_uthread_attaching = 1; X+} X+ X+/* After an attach, see if the target is threaded */ X+ X+static void X+freebsd_uthread_post_attach (int pid) X+{ X+ if (freebsd_uthread_active) X+ { X+ read_thread_offsets (); X+ inferior_ptid = find_active_ptid (); X+ add_thread (inferior_ptid); X+ } X+ else X+ { X+ unpush_target (&freebsd_uthread_ops); X+ push_target (&child_ops); X+ } X+ X+ freebsd_uthread_attaching = 0; X+} X+ X+/* Take a program previously attached to and detaches it. X+ The program resumes execution and will no longer stop X+ on signals, etc. We'd better not have left any breakpoints X+ in the program or it'll die when it hits one. For this X+ to work, it may be necessary for the process to have been X+ previously attached. It *might* work if the program was X+ started via the normal ptrace (PTRACE_TRACEME). */ X+ X+static void X+freebsd_uthread_detach (char *args, int from_tty) X+{ X+ child_ops.to_detach (args, from_tty); X+} X+ X+/* Resume execution of process PID. If STEP is nozero, then X+ just single step it. If SIGNAL is nonzero, restart it with that X+ signal activated. We may have to convert pid from a thread-id to an LWP id X+ for procfs. */ X+ X+static void X+freebsd_uthread_resume (ptid_t ptid, int step, enum target_signal signo) X+{ X+ if (freebsd_uthread_attaching) X+ { X+ child_ops.to_resume (ptid, step, signo); X+ return; X+ } X+ X+ child_ops.to_resume (ptid, step, signo); X+ cached_ptid = MERGEPID(0, 0); X+} X+ X+/* Wait for any threads to stop. We may have to convert PID from a thread id X+ to a LWP id, and vice versa on the way out. */ X+ X+static ptid_t X+freebsd_uthread_wait (ptid_t ptid, struct target_waitstatus *ourstatus) X+{ X+ ptid_t rtnval; X+ X+ if (freebsd_uthread_attaching) X+ { X+ return child_ops.to_wait (ptid, ourstatus); X+ } X+ X+ rtnval = child_ops.to_wait (ptid, ourstatus); X+ X+ if (PIDGET(rtnval) >= 0) X+ { X+ rtnval = find_active_ptid (); X+ if (!in_thread_list (rtnval)) X+ add_thread (rtnval); X+ } X+ X+ return rtnval; X+} X+ X+/* XXX: this needs to be selected by target, not [build] host */ X+#ifdef __i386__ X+ X+#include "i386-tdep.h" X+ X+static char sigmap[I386_SSE_NUM_REGS] = /* map reg to sigcontext */ X+{ X+ 12, /* eax */ X+ 11, /* ecx */ X+ 10, /* edx */ X+ 9, /* ebx */ X+ 8, /* esp */ X+ 7, /* ebp */ X+ 6, /* esi */ X+ 5, /* edi */ X+ 15, /* eip */ X+ 17, /* eflags */ X+ 16, /* cs */ X+ 19, /* ss */ X+ 4, /* ds */ X+ 3, /* es */ X+ 2, /* fs */ X+ 1, /* gs */ X+ -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ X+ -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ X+ -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ X+ -1, /* mxcsr */ X+}; X+ X+static char jmpmap[I386_SSE_NUM_REGS] = /* map reg to jmp_buf */ X+{ X+ 6, /* eax */ X+ -1, /* ecx */ X+ -1, /* edx */ X+ 1, /* ebx */ X+ 2, /* esp */ X+ 3, /* ebp */ X+ 4, /* esi */ X+ 5, /* edi */ X+ 0, /* eip */ X+ -1, /* eflags */ X+ -1, /* cs */ X+ -1, /* ss */ X+ -1, /* ds */ X+ -1, /* es */ X+ -1, /* fs */ X+ -1, /* gs */ X+ -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ X+ -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ X+ -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ X+ -1, /* mxcsr */ X+}; X+ X+#endif X+ X+#ifdef __alpha__ X+ X+#include "alpha-tdep.h" X+ X+static char sigmap[ALPHA_NUM_REGS] = /* map reg to sigcontext */ X+{ X+ 1, 2, 3, 4, 5, 6, 7, 8, /* v0 - t6 */ X+ 9, 10, 11, 12, 13, 14, 15, 16, /* t7 - fp */ X+ 17, 18, 19, 20, 21, 22, 23, 24, /* a0 - t9 */ X+ 25, 26, 27, 28, 29, 30, 31, 32, /* t10 - zero */ X+ 38, 39, 40, 41, 42, 43, 44, 45, /* f0 - f7 */ X+ 46, 47, 48, 49, 50, 51, 52, 53, /* f8 - f15 */ X+ 54, 55, 56, 57, 58, 59, 60, 61, /* f16 - f23 */ X+ 62, 63, 64, 65, 66, 67, 68, 69, /* f24 - f31 */ X+ 33, -1 /* pc, vfp */ X+}; X+static char jmpmap[ALPHA_NUM_REGS] = { X+ 4, 5, 6, 7, 8, 9, 10, 11, /* v0 - t6 */ X+ 12, 13, 14, 15, 16, 17, 18, 19, /* t7 - fp */ X+ 20, 21, 22, 23, 24, 25, 26, 27, /* a0 - t9 */ X+ 28, 29, 30, 31, 32, 33, 34, 35, /* t10 - zero */ X+ 37, 38, 39, 40, 41, 42, 43, 44, /* f0 - f7 */ X+ 45, 46, 47, 48, 49, 50, 51, 52, /* f8 - f15 */ X+ 53, 54, 55, 56, 57, 58, 59, 60, /* f16 - f23 */ X+ 61, 62, 63, 64, 65, 66, 67, 68, /* f24 - f31 */ X+ 2, -1, /* pc, vfp */ X+}; X+ X+#endif X+ X+#ifdef __sparc64__ X+ X+static char sigmap[125] = /* map reg to sigcontext */ X+{ X+ -1 X+}; X+static char jmpmap[125] = { X+ -1 X+}; X+ X+#endif X+ X+static void X+freebsd_uthread_fetch_registers (int regno) X+{ X+ struct cached_pthread *thread; X+ int active; X+ int first_regno, last_regno; X+ register_t *regbase; X+ char *regmap; X+ X+ if (freebsd_uthread_attaching || TIDGET(inferior_ptid) == 0) X+ { X+ child_ops.to_fetch_registers (regno); X+ return; X+ } X+ X+ thread = find_pthread (inferior_ptid); X+ active = (ptid_equal(inferior_ptid, find_active_ptid())); X+ X+ if (active) X+ { X+ child_ops.to_fetch_registers (regno); X+ return; X+ } X+ X+ if (regno == -1) X+ { X+ first_regno = 0; X+ last_regno = NUM_REGS - 1; X+ } X+ else X+ { X+ first_regno = regno; X+ last_regno = regno; X+ } X+ X+ regbase = (register_t*) &thread->ctx.jb[0]; X+ regmap = jmpmap; X+ X+ for (regno = first_regno; regno <= last_regno; regno++) X+ { X+ if (regmap[regno] == -1) X+ child_ops.to_fetch_registers (regno); X+ else X+ if (thread) X+ supply_register (regno, (char*) ®base[regmap[regno]]); X+ else X+ supply_register (regno, NULL); X+ } X+} X+ X+static void X+freebsd_uthread_store_registers (int regno) X+{ X+ struct cached_pthread *thread; X+ CORE_ADDR ptr; X+ int first_regno, last_regno; X+ u_int32_t *regbase; X+ char *regmap; X+ X+ if (freebsd_uthread_attaching) X+ { X+ child_ops.to_store_registers (regno); X+ return; X+ } X+ X+ thread = find_pthread (inferior_ptid); X+ X+ if (thread->state == PS_RUNNING_value) X+ { X+ child_ops.to_store_registers (regno); X+ return; X+ } X+ X+ if (regno == -1) X+ { X+ first_regno = 0; X+ last_regno = NUM_REGS - 1; X+ } X+ else X+ { X+ first_regno = regno; X+ last_regno = regno; X+ } X+ X+ regbase = (u_int32_t*) &thread->ctx.jb[0]; X+ regmap = jmpmap; X+ X+ ptr = find_pthread_addr (inferior_ptid); X+ for (regno = first_regno; regno <= last_regno; regno++) X+ { X+ if (regmap[regno] == -1) X+ child_ops.to_store_registers (regno); X+ else X+ { X+ u_int32_t *reg = ®base[regmap[regno]]; X+ int off; X+ X+ /* Hang onto cached value */ X+ memcpy(reg, registers + REGISTER_BYTE (regno), X+ REGISTER_RAW_SIZE (regno)); X+ X+ /* And push out to inferior */ X+ off = (char *) reg - (char *) thread; X+ write_memory (ptr + off, X+ registers + REGISTER_BYTE (regno), X+ REGISTER_RAW_SIZE (regno)); X+ } X+ } X+} X+ X+/* Get ready to modify the registers array. On machines which store X+ individual registers, this doesn't need to do anything. On machines X+ which store all the registers in one fell swoop, this makes sure X+ that registers contains all the registers from the program being X+ debugged. */ X+ X+static void X+freebsd_uthread_prepare_to_store (void) X+{ X+ child_ops.to_prepare_to_store (); X+} X+ X+static int X+freebsd_uthread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, X+ int dowrite, struct mem_attrib *attrib, X+ struct target_ops *target) X+{ X+ return child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, X+ attrib, target); X+} X+ X+/* Print status information about what we're accessing. */ X+ X+static void X+freebsd_uthread_files_info (struct target_ops *ignore) X+{ X+ child_ops.to_files_info (ignore); X+} X+ X+static void X+freebsd_uthread_kill_inferior (void) X+{ X+ child_ops.to_kill (); X+} X+ X+static void X+freebsd_uthread_notice_signals (ptid_t ptid) X+{ X+ child_ops.to_notice_signals (ptid); X+} X+ X+/* Fork an inferior process, and start debugging it with /proc. */ X+ X+static void X+freebsd_uthread_create_inferior (char *exec_file, char *allargs, char **env) X+{ X+ child_ops.to_create_inferior (exec_file, allargs, env); X+ X+ if (PIDGET(inferior_ptid) && freebsd_uthread_active) X+ { X+ read_thread_offsets (); X+ push_target (&freebsd_uthread_ops); X+ inferior_ptid = find_active_ptid (); X+ add_thread (inferior_ptid); X+ } X+} X+ X+/* This routine is called to find out if the inferior is using threads. X+ We check for the _thread_run and _thread_list globals. */ X+ X+void X+freebsd_uthread_new_objfile (struct objfile *objfile) X+{ X+ struct minimal_symbol *ms; X+ X+ if (!objfile) X+ { X+ freebsd_uthread_active = 0; X+ return; X+ } X+ X+ ms = lookup_minimal_symbol ("_thread_run", NULL, objfile); X+ X+ if (!ms) X+ return; X+ X+ P_thread_run = SYMBOL_VALUE_ADDRESS (ms); X+ X+ ms = lookup_minimal_symbol ("_thread_list", NULL, objfile); X+ X+ if (!ms) X+ return; X+ X+ P_thread_list = SYMBOL_VALUE_ADDRESS (ms); X+ X+#define OFFSET_SYM(field) "_thread_" #field "_offset" X+#define LOOKUP_OFFSET(field) \ X+ do { \ X+ ms = lookup_minimal_symbol (OFFSET_SYM(field), NULL, objfile); \ X+ if (!ms) \ X+ return; \ X+ P_thread_##field##_offset = SYMBOL_VALUE_ADDRESS (ms); \ X+ } while (0); X+ X+#define VALUE_SYM(name) "_thread_" #name "_value" X+#define LOOKUP_VALUE(name) \ X+ do { \ X+ ms = lookup_minimal_symbol (VALUE_SYM(name), NULL, objfile); \ X+ if (!ms) \ X+ return; \ X+ P_thread_##name##_value = SYMBOL_VALUE_ADDRESS (ms); \ X+ } while (0); X+ X+ LOOKUP_OFFSET(next); X+ LOOKUP_OFFSET(uniqueid); X+ LOOKUP_OFFSET(state); X+ LOOKUP_OFFSET(name); X+ LOOKUP_OFFSET(ctx); X+ X+ LOOKUP_VALUE(PS_RUNNING); X+ LOOKUP_VALUE(PS_DEAD); X+ X+ freebsd_uthread_active = 1; X+} X+ X+/* Clean up after the inferior dies. */ X+ X+static void X+freebsd_uthread_mourn_inferior () X+{ X+ child_ops.to_mourn_inferior (); X+ unpush_target (&freebsd_uthread_ops); X+} X+ X+/* Mark our target-struct as eligible for stray "run" and "attach" commands. */ X+ X+static int X+freebsd_uthread_can_run () X+{ X+ return child_suppress_run; X+} X+ X+static int X+freebsd_uthread_thread_alive (ptid_t ptid) X+{ X+ struct cached_pthread *thread; X+ int ret = 0; X+ X+ if (freebsd_uthread_attaching) X+ return 1; X+ X+ /* X+ * We can get called from child_ops.to_wait() which passes the underlying X+ * pid (without a thread number). X+ */ X+ if (TIDGET(ptid) == 0) X+ return 1; X+ X+ if (find_pthread_addr (ptid) != 0) X+ { X+ thread = find_pthread (ptid); X+ ret = (thread->state != PS_DEAD_value); X+ } X+ X+ if (!ret) X+ free_ptid(ptid); X+ X+ return ret; X+} X+ X+static void X+freebsd_uthread_stop (void) X+{ X+ child_ops.to_stop (); X+} X+ X+static void X+freebsd_uthread_find_new_threads (void) X+{ X+ CORE_ADDR ptr; X+ int state; X+ u_int64_t uniqueid; X+ X+ read_memory ((CORE_ADDR)P_thread_list, X+ (char *)&ptr, X+ sizeof ptr); X+ X+ while (ptr != 0) X+ { X+ READ_FIELD(ptr, int, state, state); X+ READ_FIELD(ptr, u_int64_t, uniqueid, uniqueid); X+ if (state != PS_DEAD_value && X+ !in_thread_list (find_ptid(uniqueid))) X+ add_thread (find_ptid(uniqueid)); X+ ptr = read_pthread_next(ptr); X+ } X+} X+ X+/* MUST MATCH enum pthread_state */ X+static const char *statenames[] = { X+ "RUNNING", X+ "SIGTHREAD", X+ "MUTEX_WAIT", X+ "COND_WAIT", X+ "FDLR_WAIT", X+ "FDLW_WAIT", X+ "FDR_WAIT", X+ "FDW_WAIT", X+ "POLL_WAIT", X+ "FILE_WAIT", X+ "SELECT_WAIT", X+ "SLEEP_WAIT", X+ "WAIT_WAIT", X+ "SIGSUSPEND", X+ "SIGWAIT", X+ "SPINBLOCK", X+ "JOIN", X+ "SUSPENDED", X+ "DEAD", X+ "DEADLOCK", X+}; X+ X+#if 0 X+ X+static int X+freebsd_uthread_get_thread_info (ref, selection, info) X+ gdb_threadref *ref; X+ int selection; X+ struct gdb_ext_thread_info *info; X+{ X+ int pid = *ref; X+ struct cached_pthread *thread = find_pthread (pid); X+ struct cleanup *old_chain; X+ X+ old_chain = save_inferior_pid (); X+ inferior_pid = main_pid; X+ X+ memset(&info->threadid, 0, OPAQUETHREADBYTES); X+ X+ memcpy(&info->threadid, ref, sizeof *ref); X+ info->active = thread->state == PS_RUNNING_value; X+ strcpy(info->display, statenames[thread->state]); X+ if (thread->name) X+ read_memory ((CORE_ADDR) thread->name, info->shortname, 32); X+ else X+ strcpy(info->shortname, ""); X+ X+ do_cleanups (old_chain); X+ return (0); X+} X+ X+#endif X+ X+char * X+freebsd_uthread_pid_to_str (ptid_t ptid) X+{ X+ static char buf[30]; X+ X+ if (STREQ (current_target.to_shortname, "freebsd-uthreads")) X+ sprintf (buf, "Process %d, Thread %ld", X+ PIDGET(ptid), TIDGET(ptid)); X+ else X+ sprintf (buf, "Process %d", PIDGET(ptid)); X+ X+ return buf; X+} X+ X+ X+static void X+init_freebsd_uthread_ops () X+{ X+ freebsd_uthread_ops.to_shortname = "freebsd-uthreads"; X+ freebsd_uthread_ops.to_longname = "FreeBSD uthreads"; X+ freebsd_uthread_ops.to_doc = "FreeBSD user threads support."; X+ freebsd_uthread_ops.to_open = freebsd_uthread_open; X+ freebsd_uthread_ops.to_attach = freebsd_uthread_attach; X+ freebsd_uthread_ops.to_post_attach = freebsd_uthread_post_attach; X+ freebsd_uthread_ops.to_detach = freebsd_uthread_detach; X+ freebsd_uthread_ops.to_resume = freebsd_uthread_resume; X+ freebsd_uthread_ops.to_wait = freebsd_uthread_wait; X+ freebsd_uthread_ops.to_fetch_registers = freebsd_uthread_fetch_registers; X+ freebsd_uthread_ops.to_store_registers = freebsd_uthread_store_registers; X+ freebsd_uthread_ops.to_prepare_to_store = freebsd_uthread_prepare_to_store; X+ freebsd_uthread_ops.to_xfer_memory = freebsd_uthread_xfer_memory; X+ freebsd_uthread_ops.to_files_info = freebsd_uthread_files_info; X+ freebsd_uthread_ops.to_insert_breakpoint = memory_insert_breakpoint; X+ freebsd_uthread_ops.to_remove_breakpoint = memory_remove_breakpoint; X+ freebsd_uthread_ops.to_terminal_init = terminal_init_inferior; X+ freebsd_uthread_ops.to_terminal_inferior = terminal_inferior; X+ freebsd_uthread_ops.to_terminal_ours_for_output = terminal_ours_for_output; X+ freebsd_uthread_ops.to_terminal_ours = terminal_ours; X+ freebsd_uthread_ops.to_terminal_info = child_terminal_info; X+ freebsd_uthread_ops.to_kill = freebsd_uthread_kill_inferior; X+ freebsd_uthread_ops.to_create_inferior = freebsd_uthread_create_inferior; X+ freebsd_uthread_ops.to_mourn_inferior = freebsd_uthread_mourn_inferior; X+ freebsd_uthread_ops.to_can_run = freebsd_uthread_can_run; X+ freebsd_uthread_ops.to_notice_signals = freebsd_uthread_notice_signals; X+ freebsd_uthread_ops.to_thread_alive = freebsd_uthread_thread_alive; X+ freebsd_uthread_ops.to_stop = freebsd_uthread_stop; X+ freebsd_uthread_ops.to_stratum = process_stratum; X+ freebsd_uthread_ops.to_has_all_memory = 1; X+ freebsd_uthread_ops.to_has_memory = 1; X+ freebsd_uthread_ops.to_has_stack = 1; X+ freebsd_uthread_ops.to_has_registers = 1; X+ freebsd_uthread_ops.to_has_execution = 1; X+ freebsd_uthread_ops.to_has_thread_control = 0; X+ freebsd_uthread_ops.to_magic = OPS_MAGIC; X+ freebsd_uthread_ops.to_find_new_threads = freebsd_uthread_find_new_threads; X+ freebsd_uthread_ops.to_pid_to_str = freebsd_uthread_pid_to_str; X+#if 0 X+ freebsd_uthread_vec.get_thread_info = freebsd_uthread_get_thread_info; X+#endif X+} X+ X+void X+_initialize_freebsd_uthread () X+{ X+ init_freebsd_uthread_ops (); X+ add_target (&freebsd_uthread_ops); X+ X+ target_new_objfile_chain = target_new_objfile_hook; X+ target_new_objfile_hook = freebsd_uthread_new_objfile; X+ X+ child_suppress_run = 1; X+} END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_freebsd-uthread.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_i386-tdep.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_i386-tdep.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_i386-tdep.c' X--- gdb/i386-tdep.c Mon Aug 26 11:35:25 2002 X+++ gdb/i386-tdep.c Sun Oct 13 14:15:58 2002 X@@ -534,6 +534,9 @@ X static CORE_ADDR X i386_frame_saved_pc (struct frame_info *frame) X { X+ if (kernel_debugging) X+ return fbsd_kern_frame_saved_pc(frame); X+ X if (PC_IN_CALL_DUMMY (frame->pc, 0, 0)) X return generic_read_register_dummy (frame->pc, frame->frame, X PC_REGNUM); END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_i386-tdep.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_sparc-tdep.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_sparc-tdep.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_sparc-tdep.c' X--- gdb/sparc-tdep.c.orig Sun Oct 20 18:21:09 2002 X+++ gdb/sparc-tdep.c Sun Oct 20 18:16:53 2002 X@@ -450,6 +450,9 @@ X char *buf; X CORE_ADDR addr; X X+ if (kernel_debugging) X+ return fbsd_kern_frame_saved_pc(frame); X+ X buf = alloca (MAX_REGISTER_RAW_SIZE); X if (frame->signal_handler_caller) X { X END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_sparc-tdep.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_symfile.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_symfile.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_symfile.c' X--- gdb/symfile.c Tue Feb 26 17:40:36 2002 X+++ gdb/symfile.c Wed May 29 11:10:17 2002 X@@ -1546,11 +1546,7 @@ X char *val = sect_opts[i].value; X char *sec = sect_opts[i].name; X X- val = sect_opts[i].value; X- if (val[0] == '0' && val[1] == 'x') X- addr = strtoul (val+2, NULL, 16); X- else X- addr = strtoul (val, NULL, 10); X+ addr = parse_and_eval_address(val); X X /* Here we store the section offsets in the order they were X entered on the command line. */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_symfile.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_sparcnbsd-tdep.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_sparcnbsd-tdep.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_sparcnbsd-tdep.c' Xdiff -urN gdb/sparcnbsd-tdep.c.orig gdb/sparcnbsd-tdep.c X--- gdb/sparcnbsd-tdep.c.orig Sat Oct 19 17:19:17 2002 X+++ gdb/sparcnbsd-tdep.c Sat Oct 19 17:44:47 2002 X@@ -31,20 +31,6 @@ X X #include "solib-svr4.h" X X-#define REG32_OFFSET_PSR (0 * 4) X-#define REG32_OFFSET_PC (1 * 4) X-#define REG32_OFFSET_NPC (2 * 4) X-#define REG32_OFFSET_Y (3 * 4) X-#define REG32_OFFSET_GLOBAL (4 * 4) X-#define REG32_OFFSET_OUT (12 * 4) X- X-#define REG64_OFFSET_TSTATE (0 * 8) X-#define REG64_OFFSET_PC (1 * 8) X-#define REG64_OFFSET_NPC (2 * 8) X-#define REG64_OFFSET_Y (3 * 8) X-#define REG64_OFFSET_GLOBAL (4 * 8) X-#define REG64_OFFSET_OUT (12 * 8) X- X void X sparcnbsd_supply_reg32 (char *regs, int regno) X { X@@ -375,16 +361,13 @@ X X if (gdbarch_ptr_bit (current_gdbarch) == 32) X { X- reg_size = (20 * 4); X- fpreg_size = (33 * 4); X+ reg_size = REG32_SIZE; X+ fpreg_size = FPREG32_SIZE; X } X else X { X- reg_size = (20 * 8); X- fpreg_size = (64 * 4) X- + 8 /* fsr */ X- + 4 /* gsr */ X- + 4; /* pad */ X+ reg_size = REG64_SIZE; X+ fpreg_size = FPREG64_SIZE; X } X X switch (which) X@@ -442,7 +425,7 @@ X X jb_addr = read_register (O0_REGNUM); X X- if (target_read_memory (jb_addr + 12, buf, sizeof (buf))) X+ if (target_read_memory (jb_addr + JB32_OFFSET_PC, buf, sizeof (buf))) X return 0; X X *pc = extract_address (buf, sizeof (buf)); X@@ -458,7 +441,7 @@ X X jb_addr = read_register (O0_REGNUM); X X- if (target_read_memory (jb_addr + 16, buf, sizeof (buf))) X+ if (target_read_memory (jb_addr + JB64_OFFSET_PC, buf, sizeof (buf))) X return 0; X X *pc = extract_address (buf, sizeof (buf)); END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_sparcnbsd-tdep.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_target.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_target.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_target.c' X--- gdb/target.c Mon Aug 26 12:18:33 2002 X+++ gdb/target.c Sun Oct 13 10:51:32 2002 X@@ -1429,7 +1429,7 @@ X for (t = target_structs; t < target_structs + target_struct_size; X ++t) X { X- if ((*t)->to_stratum == core_stratum) X+ if ((*t)->to_stratum == (kernel_debugging ? kcore_stratum : core_stratum)) X { X runable = *t; X ++count; END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_target.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_target.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_target.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_target.h' X--- gdb/target.h Sat Feb 9 20:08:42 2002 X+++ gdb/target.h Fri May 24 08:38:31 2002 X@@ -52,6 +52,7 @@ X dummy_stratum, /* The lowest of the low */ X file_stratum, /* Executable files, etc */ X core_stratum, /* Core dump files */ X+ kcore_stratum, /* Kernel core files */ X download_stratum, /* Downloading of remote targets */ X process_stratum, /* Executing processes */ X thread_stratum /* Executing threads */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_target.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_version.in sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_version.in << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_version.in' X--- gdb/version.in Fri Apr 26 18:04:22 2002 X+++ gdb/version.in Mon Jun 3 08:14:54 2002 X@@ -1 +1 @@ X-5.2.90 X+5.3 (FreeBSD) END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_version.in echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_config_nm-fbsd.h sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_config_nm-fbsd.h << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_nm-fbsd.h' X--- gdb/config/nm-fbsd.h Fri Jan 3 09:33:00 2003 X+++ gdb/config/nm-fbsd.h Fri Jan 3 09:36:00 2003 X@@ -0,0 +1,36 @@ X+#ifndef CONFIG_NM_FBSD_H X+#define CONFIG_NM_FBSD_H X+ X+#ifdef HAVE_SYS_PARAM_H X+#include X+#endif X+ X+extern int kernel_debugging; X+extern int kernel_writablecore; X+ X+CORE_ADDR fbsd_kern_frame_saved_pc(struct frame_info *frame); X+ X+#if __FreeBSD_version >= 500032 X+#define ADDITIONAL_OPTIONS \ X+ {"kernel", no_argument, &kernel_debugging, 1}, \ X+ {"k", no_argument, &kernel_debugging, 1}, \ X+ {"wcore", no_argument, &kernel_writablecore, 1}, \ X+ {"w", no_argument, &kernel_writablecore, 1}, X+ X+#define ADDITIONAL_OPTION_HELP \ X+ "\ X+ --kernel Enable kernel debugging.\n\ X+ --wcore Make core file writable (only works for /dev/mem).\n\ X+ This option only works while debugging a kernel !!\n\ X+" X+ X+#define DEFAULT_PROMPT kernel_debugging?"(kgdb) ":"(gdb) " X+ X+/* misuse START_PROGRESS to test whether we're running as kgdb */ X+/* START_PROGRESS is called at the top of main */ X+#undef START_PROGRESS X+#define START_PROGRESS(STR,N) \ X+ if (!strcmp (STR, "kgdb")) \ X+ kernel_debugging = 1; X+#endif X+#endif /* CONFIG_NM_FBSD_H */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_config_nm-fbsd.h echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_i386bsd-nat.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_i386bsd-nat.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_i386bsd-nat.c' X--- gdb/i386bsd-nat.c 2003/01/02 20:22:00 1.1 X+++ gdb/i386bsd-nat.c 2003/01/02 20:22:35 X@@ -306,7 +306,7 @@ X /* For some mysterious reason, some of the reserved bits in the X debug control register get set. Mask these off, otherwise the X ptrace call below will fail. */ X- dbregs.dr7 &= ~(0x0000fc00); X+ DBREG_DRX ((&dbregs), 7) = ~(0x0000fc00); X X DBREG_DRX ((&dbregs), regnum) = value; X X@@ -355,7 +355,7 @@ X return 0; X #endif X X- return dbregs.dr6; X+ return DBREG_DRX ((&dbregs), 6); X } X X #endif /* PT_GETDBREGS */ END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_i386bsd-nat.c echo x - /usr/ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c sed 's/^X//' >/usr/ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c << 'END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c' X--- gdb/kvm-fbsd.c Fri Jan 3 08:57:23 2003 X+++ gdb/kvm-fbsd.c Fri Jan 3 08:57:20 2003 X@@ -0,0 +1,756 @@ X+/* Kernel core dump functions below target vector, for GDB. X+ Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995 X+ Free Software Foundation, Inc. X+ X+This file is part of GDB. X+ X+This program is free software; you can redistribute it and/or modify X+it under the terms of the GNU General Public License as published by X+the Free Software Foundation; either version 2 of the License, or X+(at your option) any later version. X+ X+This program is distributed in the hope that it will be useful, X+but WITHOUT ANY WARRANTY; without even the implied warranty of X+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the X+GNU General Public License for more details. X+ X+You should have received a copy of the GNU General Public License X+along with this program; if not, write to the Free Software X+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. X+*/ X+ X+/* $FreeBSD: ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c,v 1.1 2003/09/27 07:38:23 edwin Exp $ */ X+ X+/* X+ * This works like "remote" but, you use it like this: X+ * target kcore /dev/mem X+ * or X+ * target kcore /var/crash/host/core.0 X+ * X+ * This way makes it easy to short-circut the whole bfd monster, X+ * and direct the inferior stuff to our libkvm implementation. X+ * X+ */ X+ X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+#include X+ X+#include "defs.h" X+#include "gdb_string.h" X+#include "frame.h" /* required by inferior.h */ X+#include "inferior.h" X+#include "symtab.h" X+#include "symfile.h" X+#include "objfiles.h" X+#include "command.h" X+#include "bfd.h" X+#include "target.h" X+#include "gdbcore.h" X+#include "regcache.h" X+ X+#if __FreeBSD_version >= 500032 X+static void X+kcore_files_info (struct target_ops *); X+ X+static void X+kcore_close (int); X+ X+static void X+get_kcore_registers (int); X+ X+static int X+xfer_mem (CORE_ADDR, char *, int, int, struct mem_attrib *, X+ struct target_ops *); X+ X+static int X+xfer_umem (CORE_ADDR, char *, int, int); X+ X+static char *core_file; X+static kvm_t *core_kd; X+static struct pcb cur_pcb; X+static struct kinfo_proc *cur_proc; X+ X+static struct target_ops kcore_ops; X+ X+int kernel_debugging; X+int kernel_writablecore; X+ X+/* Read the "thing" at kernel address 'addr' into the space pointed to X+ by point. The length of the "thing" is determined by the type of p. X+ Result is non-zero if transfer fails. */ X+ X+#define kvread(addr, p) \ X+ (target_read_memory ((CORE_ADDR) (addr), (char *) (p), sizeof (*(p)))) X+ X+static CORE_ADDR X+ksym_kernbase (void) X+{ X+ static CORE_ADDR kernbase; X+ struct minimal_symbol *sym; X+ X+ if (kernbase == 0) X+ { X+ sym = lookup_minimal_symbol ("kernbase", NULL, NULL); X+ if (sym == NULL) { X+ kernbase = KERNBASE; X+ } else { X+ kernbase = SYMBOL_VALUE_ADDRESS (sym); X+ } X+ } X+ return kernbase; X+} X+ X+#define KERNOFF (ksym_kernbase ()) X+#define INKERNEL(x) ((x) >= KERNOFF) X+ X+CORE_ADDR X+ksym_lookup(const char *name) X+{ X+ struct minimal_symbol *sym; X+ X+ sym = lookup_minimal_symbol (name, NULL, NULL); X+ if (sym == NULL) X+ error ("kernel symbol `%s' not found.", name); X+ X+ return SYMBOL_VALUE_ADDRESS (sym); X+} X+ X+/* Provide the address of an initial PCB to use. X+ If this is a crash dump, try for "dumppcb". X+ If no "dumppcb" or it's /dev/mem, use proc0. X+ Return the core address of the PCB we found. */ X+ X+static CORE_ADDR X+initial_pcb (void) X+{ X+ struct minimal_symbol *sym; X+ CORE_ADDR addr; X+ void *val; X+ X+ /* Make sure things are open... */ X+ if (!core_kd || !core_file) X+ return (0); X+ X+ /* If this is NOT /dev/mem try for dumppcb. */ X+ if (strncmp (core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) X+ { X+ sym = lookup_minimal_symbol ("dumppcb", NULL, NULL); X+ if (sym != NULL) X+ { X+ addr = SYMBOL_VALUE_ADDRESS (sym); X+ return (addr); X+ } X+ } X+ X+ /* OK, just use thread0's pcb. Note that curproc might X+ not exist, and if it does, it will point to gdb. X+ Therefore, just use proc0 and let the user set X+ some other context if they care about it. */ X+ X+ addr = ksym_lookup ("thread0"); X+ if (kvread (addr, &val)) X+ { X+ error ("cannot read thread0 pointer at %x\n", addr); X+ val = 0; X+ } X+ else X+ { X+ /* Read the PCB address in thread structure. */ X+ addr += offsetof (struct thread, td_pcb); X+ if (kvread (addr, &val)) X+ { X+ error ("cannot read thread0->td_pcb pointer at %x\n", addr); X+ val = 0; X+ } X+ } X+ X+ /* thread0 is wholly in the kernel and cur_proc is only used for X+ reading user mem, so no point in setting this up. */ X+ cur_proc = 0; X+ X+ return ((CORE_ADDR)val); X+} X+ X+/* Set the current context to that of the PCB struct at the system address X+ passed. */ X+ X+static int X+set_context (CORE_ADDR addr) X+{ X+ CORE_ADDR procaddr = 0; X+ X+ if (kvread (addr, &cur_pcb)) X+ error ("cannot read pcb at %#x", addr); X+ X+ /* Fetch all registers from core file. */ X+ target_fetch_registers (-1); X+ X+ /* Now, set up the frame cache, and print the top of stack. */ X+ flush_cached_frames (); X+ set_current_frame (create_new_frame (read_fp (), read_pc ())); X+ select_frame (get_current_frame ()); X+ return (0); X+} X+ X+/* Discard all vestiges of any previous core file and mark data and stack X+ spaces as empty. */ X+ X+/* ARGSUSED */ X+static void X+kcore_close (int quitting) X+{ X+ X+ inferior_ptid = null_ptid; /* Avoid confusion from thread stuff. */ X+ X+ if (core_kd) X+ { X+ kvm_close (core_kd); X+ free (core_file); X+ core_file = NULL; X+ core_kd = NULL; X+ } X+} X+ X+/* This routine opens and sets up the core file bfd. */ X+ X+static void X+kcore_open (char *filename /* the core file */, int from_tty) X+{ X+ kvm_t *kd; X+ const char *p; X+ struct cleanup *old_chain; X+ char buf[256], *cp; X+ int ontop; X+ CORE_ADDR addr; X+ X+ target_preopen (from_tty); X+ X+ /* The exec file is required for symbols. */ X+ if (exec_bfd == NULL) X+ error ("No kernel exec file specified"); X+ X+ if (core_kd) X+ { X+ error ("No core file specified." X+ " (Use `detach' to stop debugging a core file.)"); X+ return; X+ } X+ X+ if (!filename) X+ { X+ error ("No core file specified."); X+ return; X+ } X+ X+ filename = tilde_expand (filename); X+ if (filename[0] != '/') X+ { X+ cp = concat (current_directory, "/", filename, NULL); X+ free (filename); X+ filename = cp; X+ } X+ X+ old_chain = make_cleanup (free, filename); X+ X+ kd = kvm_open (bfd_get_filename(exec_bfd), filename, NULL, X+ kernel_writablecore ? O_RDWR: O_RDONLY, 0); X+ if (kd == NULL) X+ { X+ perror_with_name (filename); X+ return; X+ } X+ X+ /* Looks semi-reasonable. Toss the old core file and work on the new. */ X+ X+ discard_cleanups (old_chain); /* Don't free filename any more. */ X+ core_file = filename; X+ unpush_target (&kcore_ops); X+ ontop = !push_target (&kcore_ops); X+ X+ /* Note unpush_target (above) calls kcore_close. */ X+ core_kd = kd; X+ X+ /* Print out the panic string if there is one. */ X+ if (kvread (ksym_lookup ("panicstr"), &addr) == 0 && X+ addr != 0 && X+ target_read_memory (addr, buf, sizeof(buf)) == 0) X+ { X+ X+ for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++) X+ if (!isascii (*cp) || (!isprint (*cp) && !isspace (*cp))) X+ *cp = '?'; X+ *cp = '\0'; X+ if (buf[0] != '\0') X+ printf_filtered ("panic: %s\n", buf); X+ } X+ X+ /* Print all the panic messages if possible. */ X+ if (symfile_objfile != NULL) X+ { X+ printf ("panic messages:\n---\n"); X+ snprintf (buf, sizeof buf, X+ "/sbin/dmesg -N %s -M %s | \ X+ /usr/bin/awk '/^(panic:|Fatal trap) / { printing = 1 } \ X+ { if (printing) print $0 }'", X+ symfile_objfile->name, filename); X+ fflush (stdout); X+ system (buf); X+ printf ("---\n"); X+ } X+ X+ if (!ontop) X+ { X+ warning ("you won't be able to access this core file until you terminate\n" X+ "your %s; do ``info files''", target_longname); X+ return; X+ } X+ X+ /* Now, set up process context, and print the top of stack. */ X+ (void)set_context (initial_pcb()); X+ print_stack_frame (selected_frame, frame_relative_level(selected_frame), 1); X+} X+ X+static void X+kcore_detach (char *args, int from_tty) X+{ X+ if (args) X+ error ("Too many arguments"); X+ unpush_target (&kcore_ops); X+ reinit_frame_cache (); X+ if (from_tty) X+ printf_filtered ("No kernel core file now.\n"); X+} X+ X+#ifdef __alpha__ X+ X+#include "alpha/tm-alpha.h" X+#include "alpha-tdep.h" X+ X+#ifndef S0_REGNUM X+#define S0_REGNUM (ALPHA_T7_REGNUM+1) X+#endif X+ X+fetch_kcore_registers (struct pcb *pcbp) X+{ X+ X+ /* First clear out any garbage. */ X+ memset (registers, '\0', REGISTER_BYTES); X+ X+ /* SP */ X+ *(long *) ®isters[REGISTER_BYTE (SP_REGNUM)] = X+ pcbp->pcb_hw.apcb_ksp; X+ X+ /* S0 through S6 */ X+ memcpy (®isters[REGISTER_BYTE (S0_REGNUM)], X+ &pcbp->pcb_context[0], 7 * sizeof (long)); X+ X+ /* PC */ X+ *(long *) ®isters[REGISTER_BYTE (PC_REGNUM)] = X+ pcbp->pcb_context[7]; X+ X+ registers_fetched (); X+} X+ X+ X+CORE_ADDR X+fbsd_kern_frame_saved_pc (struct frame_info *fi) X+{ X+ struct minimal_symbol *sym; X+ CORE_ADDR this_saved_pc; X+ X+ this_saved_pc = FRAME_SAVED_PC(fi); X+ X+ sym = lookup_minimal_symbol_by_pc (this_saved_pc); X+ X+ if (sym != NULL && X+ (strcmp (SYMBOL_NAME (sym), "XentArith") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentIF") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentInt") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentMM") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentSys") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentUna") == 0 || X+ strcmp (SYMBOL_NAME (sym), "XentRestart") == 0)) X+ { X+ return (read_memory_integer (fi->frame + 32 * 8, 8)); X+ } X+ else X+ { X+ return (this_saved_pc); X+ } X+} X+ X+#endif /* __alpha__ */ X+ X+#ifdef __i386__ X+ X+static CORE_ADDR X+ksym_maxuseraddr (void) X+{ X+ static CORE_ADDR maxuseraddr; X+ struct minimal_symbol *sym; X+ X+ if (maxuseraddr == 0) X+ { X+ sym = lookup_minimal_symbol ("PTmap", NULL, NULL); X+ if (sym == NULL) { X+ maxuseraddr = VM_MAXUSER_ADDRESS; X+ } else { X+ maxuseraddr = SYMBOL_VALUE_ADDRESS (sym); X+ } X+ } X+ return maxuseraddr; X+} X+ X+ X+/* Symbol names of kernel entry points. Use special frames. */ X+#define KSYM_TRAP "calltrap" X+#define KSYM_INTR "Xintr" X+#define KSYM_FASTINTR "Xfastintr" X+#define KSYM_OLDSYSCALL "Xlcall_syscall" X+#define KSYM_SYSCALL "Xint0x80_syscall" X+ X+/* The following is FreeBSD-specific hackery to decode special frames X+ and elide the assembly-language stub. This could be made faster by X+ defining a frame_type field in the machine-dependent frame information, X+ but we don't think that's too important right now. */ X+enum frametype { tf_normal, tf_trap, tf_interrupt, tf_syscall }; X+ X+CORE_ADDR X+fbsd_kern_frame_saved_pc (struct frame_info *fr) X+{ X+ struct minimal_symbol *sym; X+ CORE_ADDR this_saved_pc; X+ enum frametype frametype; X+ X+ this_saved_pc = read_memory_integer (fr->frame + 4, 4); X+ sym = lookup_minimal_symbol_by_pc (this_saved_pc); X+ frametype = tf_normal; X+ if (sym != NULL) X+ { X+ if (strcmp (SYMBOL_NAME (sym), KSYM_TRAP) == 0) X+ frametype = tf_trap; X+ else X+ if (strncmp (SYMBOL_NAME (sym), KSYM_INTR, X+ strlen (KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym), X+ KSYM_FASTINTR, strlen (KSYM_FASTINTR)) == 0) X+ frametype = tf_interrupt; X+ else X+ if (strcmp (SYMBOL_NAME (sym), KSYM_SYSCALL) == 0 || X+ strcmp (SYMBOL_NAME (sym), KSYM_OLDSYSCALL) == 0) X+ frametype = tf_syscall; X+ } X+ X+ switch (frametype) X+ { X+ default: X+ case tf_normal: X+ return (this_saved_pc); X+#define oEIP offsetof (struct trapframe, tf_eip) X+ X+ case tf_trap: X+ return (read_memory_integer (fr->frame + 8 + oEIP, 4)); X+ X+ case tf_interrupt: X+ return (read_memory_integer (fr->frame + 12 + oEIP, 4)); X+ X+ case tf_syscall: X+ return (read_memory_integer (fr->frame + 8 + oEIP, 4)); X+#undef oEIP X+ } X+} X+ X+static void X+fetch_kcore_registers (struct pcb *pcb) X+{ X+ int i; X+ int noreg; X+ X+ /* Get the register values out of the sys pcb and store them where X+ `read_register' will find them. */ X+ /* X+ * XXX many registers aren't available. X+ * XXX for the non-core case, the registers are stale - they are for X+ * the last context switch to the debugger. X+ * XXX gcc's register numbers aren't all #defined in tm-i386.h. X+ */ X+ noreg = 0; X+ for (i = 0; i < 3; ++i) /* eax,ecx,edx */ X+ supply_register (i, (char *)&noreg); X+ X+ supply_register (3, (char *) &pcb->pcb_ebx); X+ supply_register (SP_REGNUM, (char *) &pcb->pcb_esp); X+ supply_register (FP_REGNUM, (char *) &pcb->pcb_ebp); X+ supply_register (6, (char *) &pcb->pcb_esi); X+ supply_register (7, (char *) &pcb->pcb_edi); X+ supply_register (PC_REGNUM, (char *) &pcb->pcb_eip); X+ X+ for (i = 9; i < 14; ++i) /* eflags, cs, ss, ds, es, fs */ X+ supply_register (i, (char *) &noreg); X+ supply_register (15, (char *) &pcb->pcb_gs); X+ X+ /* XXX 80387 registers? */ X+} X+ X+#endif /* __i386__ */ X+ X+#ifdef __sparc64__ X+ X+#define SPARC_INTREG_SIZE 8 X+ X+static void X+fetch_kcore_registers (struct pcb *pcbp) X+{ X+ static struct frame top; X+ CORE_ADDR f_addr; X+ int i; X+ X+ /* Get the register values out of the sys pcb and store them where X+ `read_register' will find them. */ X+ /* X+ * XXX many registers aren't available. X+ * XXX for the non-core case, the registers are stale - they are for X+ * the last context switch to the debugger. X+ * XXX do something with the floating-point registers? X+ */ X+ supply_register (SP_REGNUM, &pcbp->pcb_fp); X+ supply_register (PC_REGNUM, &pcbp->pcb_pc); X+ f_addr = extract_address (&pcbp->pcb_fp, SPARC_INTREG_SIZE); X+ /* Load the previous frame by hand (XXX) and supply it. */ X+ read_memory (f_addr + SPOFF, (char *)&top, sizeof (top)); X+ for (i = 0; i < 8; i++) X+ supply_register (i + L0_REGNUM, &top.fr_local[i]); X+ for (i = 0; i < 8; i++) X+ supply_register (i + I0_REGNUM, &top.fr_in[i]); X+} X+ X+CORE_ADDR X+fbsd_kern_frame_saved_pc (struct frame_info *fi) X+{ X+ struct minimal_symbol *sym; X+ CORE_ADDR frame, pc_addr, pc; X+ char *buf; X+ X+ buf = alloca (MAX_REGISTER_RAW_SIZE); X+ /* XXX: duplicates fi->extra_info->bottom. */ X+ frame = (fi->next != NULL) ? fi->next->frame : read_sp (); X+ pc_addr = frame + offsetof (struct frame, fr_in[7]); X+ X+#define READ_PC(pc, a, b) do { \ X+ read_memory (a, b, SPARC_INTREG_SIZE); \ X+ pc = extract_address (b, SPARC_INTREG_SIZE); \ X+} while (0) X+ X+ READ_PC (pc, pc_addr, buf); X+ X+ sym = lookup_minimal_symbol_by_pc (pc); X+ if (sym != NULL) X+ { X+ if (strncmp (SYMBOL_NAME (sym), "tl0_", 4) == 0 || X+ strcmp (SYMBOL_NAME (sym), "btext") == 0 || X+ strcmp (SYMBOL_NAME (sym), "mp_startup") == 0 || X+ strcmp (SYMBOL_NAME (sym), "fork_trampoline") == 0) X+ { X+ /* X+ * Ugly kluge: user space addresses aren't separated from kernel X+ * ones by range; if encountering a trap from user space, just X+ * return a 0 to stop the trace. X+ * Do the same for entry points of kernel processes to avoid X+ * printing garbage. X+ */ X+ pc = 0; X+ } X+ if (strncmp (SYMBOL_NAME (sym), "tl1_", 4) == 0) X+ { X+ pc_addr = fi->frame + sizeof (struct frame) + X+ offsetof (struct trapframe, tf_tpc); X+ READ_PC (pc, pc_addr, buf); X+ } X+ } X+ return (pc); X+} X+ X+#endif /* __sparc64__ */ X+ X+/* Get the registers out of a core file. This is the machine- X+ independent part. Fetch_core_registers is the machine-dependent X+ part, typically implemented in the xm-file for each architecture. */ X+ X+/* We just get all the registers, so we don't use regno. */ X+ X+/* ARGSUSED */ X+static void X+get_kcore_registers (int regno) X+{ X+ X+ /* XXX - Only read the pcb when set_context() is called. X+ When looking at a live kernel this may be a problem, X+ but the user can do another "proc" or "pcb" command to X+ grab a new copy of the pcb... */ X+ X+ /* Zero out register set then fill in the ones we know about. */ X+ fetch_kcore_registers (&cur_pcb); X+} X+ X+static void X+kcore_files_info (t) X+ struct target_ops *t; X+{ X+ printf_filtered ("\t`%s'\n", core_file); X+} X+ X+/* If mourn is being called in all the right places, this could be say X+ `gdb internal error' (since generic_mourn calls breakpoint_init_inferior). */ X+ X+static int X+ignore (CORE_ADDR addr, char *contents) X+{ X+ return 0; X+} X+ X+static int X+xfer_kmem (CORE_ADDR memaddr, char *myaddr, int len, int write, X+ struct mem_attrib *attrib, struct target_ops *target) X+{ X+ int n; X+ X+ X+ if (!INKERNEL (memaddr)) X+ return xfer_umem (memaddr, myaddr, len, write); X+ X+ if (core_kd == NULL) X+ return 0; X+ X+ if (write) X+ n = kvm_write (core_kd, memaddr, myaddr, len); X+ else X+ n = kvm_read (core_kd, memaddr, myaddr, len) ; X+ if (n < 0) { X+ fprintf_unfiltered (gdb_stderr, "can not access 0x%x, %s\n", X+ memaddr, kvm_geterr (core_kd)); X+ n = 0; X+ } X+ X+ return n; X+} X+ X+ X+static int X+xfer_umem (CORE_ADDR memaddr, char *myaddr, int len, int write /* ignored */) X+{ X+ int n = 0; X+ X+ if (cur_proc == 0) X+ { X+ error ("---Can't read userspace from dump, or kernel process---\n"); X+ return 0; X+ } X+ X+ if (write) X+ error ("kvm_uwrite unimplemented\n"); X+ else X+ n = kvm_uread (core_kd, cur_proc, memaddr, myaddr, len) ; X+ X+ if (n < 0) X+ return 0; X+ X+ return n; X+} X+ X+static void X+set_proc_cmd (char *arg, int from_tty) X+{ X+ CORE_ADDR addr, pid_addr, first_td; X+ void *val; X+ struct kinfo_proc *kp; X+ int cnt; X+ pid_t pid; X+ X+ if (!arg) X+ error_no_arg ("proc address for the new context"); X+ X+ if (core_kd == NULL) X+ error ("no kernel core file"); X+ X+ addr = (CORE_ADDR) parse_and_eval_address (arg); X+ X+ if (!INKERNEL (addr)) X+ { X+ kp = kvm_getprocs (core_kd, KERN_PROC_PID, addr, &cnt); X+ if (!cnt) X+ error ("invalid pid"); X+ addr = (CORE_ADDR)kp->ki_paddr; X+ cur_proc = kp; X+ } X+ else X+ { X+ /* Update cur_proc. */ X+ pid_addr = addr + offsetof (struct proc, p_pid); X+ if (kvread (pid_addr, &pid)) X+ error ("cannot read pid ptr"); X+ cur_proc = kvm_getprocs (core_kd, KERN_PROC_PID, pid, &cnt); X+ if (!cnt) X+ error("invalid pid"); X+ } X+ X+ /* Find the first thread in the process. XXXKSE */ X+ addr += offsetof (struct proc, p_threads.tqh_first); X+ if (kvread (addr, &first_td)) X+ error ("cannot read thread ptr"); X+ X+ /* Read the PCB address in thread structure. */ X+ addr = first_td + offsetof (struct thread, td_pcb); X+ if (kvread (addr, &val)) X+ error("cannot read pcb ptr"); X+ X+ /* Read the PCB address in proc structure. */ X+ if (set_context ((CORE_ADDR) val)) X+ error ("invalid proc address"); X+} X+#else X+int kernel_debugging = 0; X+int kernel_writablecore = 0; X+ X+CORE_ADDR X+fbsd_kern_frame_saved_pc (struct frame_info *fi) X+{ X+ return 0; X+} X+#endif X+ X+void X+_initialize_kcorelow (void) X+{ X+#if __FreeBSD_version >= 500032 X+ kcore_ops.to_shortname = "kcore"; X+ kcore_ops.to_longname = "Kernel core dump file"; X+ kcore_ops.to_doc = X+ "Use a core file as a target. Specify the filename of the core file."; X+ kcore_ops.to_open = kcore_open; X+ kcore_ops.to_close = kcore_close; X+ kcore_ops.to_attach = find_default_attach; X+ kcore_ops.to_detach = kcore_detach; X+ kcore_ops.to_fetch_registers = get_kcore_registers; X+ kcore_ops.to_xfer_memory = xfer_kmem; X+ kcore_ops.to_files_info = kcore_files_info; X+ kcore_ops.to_create_inferior = find_default_create_inferior; X+ kcore_ops.to_stratum = kcore_stratum; X+ kcore_ops.to_has_memory = 1; X+ kcore_ops.to_has_stack = 1; X+ kcore_ops.to_has_registers = 1; X+ kcore_ops.to_magic = OPS_MAGIC; X+ X+ add_target (&kcore_ops); X+ add_com ("proc", class_obscure, set_proc_cmd, "Set current process context"); X+#endif X+} END-of-/usr/ports/devel/gdb53-act/files/patch-gdb_kvm-fbsd.c echo x - /usr/ports/devel/gdb53-act/Makefile sed 's/^X//' >/usr/ports/devel/gdb53-act/Makefile << 'END-of-/usr/ports/devel/gdb53-act/Makefile' X# Ports collection makefile for: GDB 5.3-act X# Date created: 8 August 2003 X# Whom: John R. Shannon X# X# $FreeBSD: ports/devel/gdb53-act/Makefile,v 1.7 2004/04/01 12:08:32 kris Exp $ X XPORTNAME= gdb XPORTVERSION= 5.3 XPORTREVISION= 2 XPORTEPOCH= 1 XCATEGORIES= devel XMASTER_SITES= http://www.johnrshannon.com/download/ XPKGNAMESUFFIX= -act XDISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} X XMAINTAINER= john@johnrshannon.com XCOMMENT= GDB 5.3 modified by ACT for Ada programming language X XWRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} XPLIST_FILES= bin/gdbada XUSE_GMAKE= yes XGNU_CONFIGURE= yes XCONFIGURE_ARGS= --program-suffix=ada XCONFIGURE_ARGS+= --disable-nls X X.include X X.if ${ARCH} != "i386" && ${ARCH} != "alpha" XBROKEN= "Does not compile on !i386 and !alpha" X.endif X Xpre-configure: X cd ${WRKSRC} ; ${RM} -rf dejagnu expect sim tcl texinfo X Xdo-install: X ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdbada X X.include END-of-/usr/ports/devel/gdb53-act/Makefile echo x - /usr/ports/devel/gdb53-act/distinfo sed 's/^X//' >/usr/ports/devel/gdb53-act/distinfo << 'END-of-/usr/ports/devel/gdb53-act/distinfo' XMD5 (gdb-act-5.3.tar.gz) = 217213357a364a4df97e693b69eee5cb END-of-/usr/ports/devel/gdb53-act/distinfo echo x - /usr/ports/devel/gdb53-act/pkg-descr sed 's/^X//' >/usr/ports/devel/gdb53-act/pkg-descr << 'END-of-/usr/ports/devel/gdb53-act/pkg-descr' XGNU GDB 5.3 developmental snapshot. END-of-/usr/ports/devel/gdb53-act/pkg-descr echo x - /usr/ports/devel/gdb53-act/OLD-DIRS sed 's/^X//' >/usr/ports/devel/gdb53-act/OLD-DIRS << 'END-of-/usr/ports/devel/gdb53-act/OLD-DIRS' Xshare/xml Xshare/skel Xshare/sgml Xshare/nls/zh_TW.Big5 Xshare/nls/zh_CN.eucCN Xshare/nls/uk_UA.KOI8-U Xshare/nls/uk_UA.ISO8859-5 Xshare/nls/tr_TR.ISO8859-9 Xshare/nls/sv_SE.ISO8859-15 Xshare/nls/sv_SE.ISO8859-1 Xshare/nls/sr_YU.ISO8859-5 Xshare/nls/sr_YU.ISO8859-2 Xshare/nls/sl_SI.ISO8859-2 Xshare/nls/sk_SK.ISO8859-2 Xshare/nls/ru_RU.KOI8-R Xshare/nls/ru_RU.ISO8859-5 Xshare/nls/ru_RU.CP866 Xshare/nls/ro_RO.ISO8859-2 Xshare/nls/pt_PT.ISO8859-15 Xshare/nls/pt_PT.ISO8859-1 Xshare/nls/pt_BR.ISO8859-1 Xshare/nls/pl_PL.ISO8859-2 Xshare/nls/no_NO.ISO8859-15 Xshare/nls/no_NO.ISO8859-1 Xshare/nls/nl_NL.ISO8859-15 Xshare/nls/nl_NL.ISO8859-1 Xshare/nls/nl_BE.ISO8859-15 Xshare/nls/nl_BE.ISO8859-1 Xshare/nls/lt_LT.ISO8859-4 Xshare/nls/lt_LT.ISO8859-13 Xshare/nls/la_LN.US-ASCII Xshare/nls/la_LN.ISO8859-4 Xshare/nls/la_LN.ISO8859-2 Xshare/nls/la_LN.ISO8859-15 Xshare/nls/la_LN.ISO8859-1 Xshare/nls/ko_KR.eucKR Xshare/nls/ja_JP.eucJP Xshare/nls/ja_JP.SJIS Xshare/nls/it_IT.ISO8859-15 Xshare/nls/it_IT.ISO8859-1 Xshare/nls/it_CH.ISO8859-15 Xshare/nls/it_CH.ISO8859-1 Xshare/nls/is_IS.ISO8859-15 Xshare/nls/is_IS.ISO8859-1 Xshare/nls/hu_HU.ISO8859-2 Xshare/nls/hr_HR.ISO8859-2 Xshare/nls/hi_IN.ISCII-DEV Xshare/nls/fr_FR.ISO8859-15 Xshare/nls/fr_FR.ISO8859-1 Xshare/nls/fr_CH.ISO8859-15 Xshare/nls/fr_CH.ISO8859-1 Xshare/nls/fr_CA.ISO8859-15 Xshare/nls/fr_CA.ISO8859-1 Xshare/nls/fr_BE.ISO8859-15 Xshare/nls/fr_BE.ISO8859-1 Xshare/nls/fi_FI.ISO8859-15 Xshare/nls/fi_FI.ISO8859-1 Xshare/nls/et_EE.ISO8859-15 Xshare/nls/es_ES.ISO8859-15 Xshare/nls/es_ES.ISO8859-1 Xshare/nls/en_US.ISO8859-15 Xshare/nls/en_US.ISO8859-1 Xshare/nls/en_NZ.US-ASCII Xshare/nls/en_NZ.ISO8859-15 Xshare/nls/en_NZ.ISO8859-1 Xshare/nls/en_GB.US-ASCII Xshare/nls/en_GB.ISO8859-15 Xshare/nls/en_GB.ISO8859-1 Xshare/nls/en_CA.US-ASCII Xshare/nls/en_CA.ISO8859-15 Xshare/nls/en_CA.ISO8859-1 Xshare/nls/en_AU.US-ASCII Xshare/nls/en_AU.ISO8859-15 Xshare/nls/en_AU.ISO8859-1 Xshare/nls/el_GR.ISO8859-7 Xshare/nls/de_DE.ISO8859-15 Xshare/nls/de_DE.ISO8859-1 Xshare/nls/de_CH.ISO8859-15 Xshare/nls/de_CH.ISO8859-1 Xshare/nls/de_AT.ISO8859-15 Xshare/nls/de_AT.ISO8859-1 Xshare/nls/da_DK.ISO8859-15 Xshare/nls/da_DK.ISO8859-1 Xshare/nls/cs_CZ.ISO8859-2 Xshare/nls/ca_ES.ISO8859-15 Xshare/nls/ca_ES.ISO8859-1 Xshare/nls/bg_BG.CP1251 Xshare/nls/af_ZA.ISO8859-15 Xshare/nls/af_ZA.ISO8859-1 Xshare/nls/C Xshare/nls Xshare/misc Xshare/java/classes Xshare/java Xshare/examples Xshare/emacs/site-lisp Xshare/emacs Xshare/doc/ja Xshare/doc Xshare/dict Xshare/aclocal Xshare Xsbin Xman/ru.KOI8-R/mann Xman/ru.KOI8-R/manl Xman/ru.KOI8-R/man9 Xman/ru.KOI8-R/man8 Xman/ru.KOI8-R/man7 Xman/ru.KOI8-R/man6 Xman/ru.KOI8-R/man5 Xman/ru.KOI8-R/man4 Xman/ru.KOI8-R/man3 Xman/ru.KOI8-R/man2 Xman/ru.KOI8-R/man1 Xman/ru.KOI8-R/catn Xman/ru.KOI8-R/catl Xman/ru.KOI8-R/cat9 Xman/ru.KOI8-R/cat8 Xman/ru.KOI8-R/cat7 Xman/ru.KOI8-R/cat6 Xman/ru.KOI8-R/cat5 Xman/ru.KOI8-R/cat4 Xman/ru.KOI8-R/cat3 Xman/ru.KOI8-R/cat2 Xman/ru.KOI8-R/cat1 Xman/ru.KOI8-R Xman/mann Xman/manl Xman/man9 Xman/man8 Xman/man7 Xman/man6 Xman/man5 Xman/man4 Xman/man3 Xman/man2 Xman/man1 Xman/ja/mann Xman/ja/manl Xman/ja/man9 Xman/ja/man8 Xman/ja/man7 Xman/ja/man6 Xman/ja/man5 Xman/ja/man4 Xman/ja/man3 Xman/ja/man2 Xman/ja/man1 Xman/ja/catn Xman/ja/catl Xman/ja/cat9 Xman/ja/cat8 Xman/ja/cat7 Xman/ja/cat6 Xman/ja/cat5 Xman/ja/cat4 Xman/ja/cat3 Xman/ja/cat2 Xman/ja/cat1 Xman/ja Xman/en.ISO8859-1/catn Xman/en.ISO8859-1/cat9/i386 Xman/en.ISO8859-1/cat9 Xman/en.ISO8859-1/cat8/i386 Xman/en.ISO8859-1/cat8/alpha Xman/en.ISO8859-1/cat8 Xman/en.ISO8859-1/cat7 Xman/en.ISO8859-1/cat6 Xman/en.ISO8859-1/cat5 Xman/en.ISO8859-1/cat4/i386 Xman/en.ISO8859-1/cat4/alpha Xman/en.ISO8859-1/cat4 Xman/en.ISO8859-1/cat3 Xman/en.ISO8859-1/cat2 Xman/en.ISO8859-1/cat1aout Xman/en.ISO8859-1/cat1 Xman/en.ISO8859-1 Xman/de.ISO8859-1/mann Xman/de.ISO8859-1/manl Xman/de.ISO8859-1/man9 Xman/de.ISO8859-1/man8 Xman/de.ISO8859-1/man7 Xman/de.ISO8859-1/man6 Xman/de.ISO8859-1/man5 Xman/de.ISO8859-1/man4 Xman/de.ISO8859-1/man3 Xman/de.ISO8859-1/man2 Xman/de.ISO8859-1/man1 Xman/de.ISO8859-1/catn Xman/de.ISO8859-1/catl Xman/de.ISO8859-1/cat9 Xman/de.ISO8859-1/cat8 Xman/de.ISO8859-1/cat7 Xman/de.ISO8859-1/cat6 Xman/de.ISO8859-1/cat5 Xman/de.ISO8859-1/cat4 Xman/de.ISO8859-1/cat3 Xman/de.ISO8859-1/cat2 Xman/de.ISO8859-1/cat1 Xman/de.ISO8859-1 Xman/catn Xman/catl Xman/cat9 Xman/cat8 Xman/cat7 Xman/cat6 Xman/cat5 Xman/cat4 Xman/cat3 Xman/cat2 Xman/cat1 Xman Xlibexec Xlibdata Xlib Xinfo Xinclude Xetc/rc.d Xetc/pam.d Xetc Xbin END-of-/usr/ports/devel/gdb53-act/OLD-DIRS exit >Release-Note: >Audit-Trail: State-Changed-From-To: open->closed State-Changed-By: pav State-Changed-When: Mon May 24 16:22:26 PDT 2004 State-Changed-Why: Committed, thanks! Please note that preferred way of submitting updates to existing ports is a diff, not a shar of whole port. Please consult Updating chapter of Porter's Handbook: http://www.freebsd.org/doc/en/books/porters-handbook/port-upgrading.html http://www.freebsd.org/cgi/query-pr.cgi?pr=66832 >Unformatted: