From owner-p4-projects@FreeBSD.ORG Thu Apr 1 23:47:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13DF716A4D0; Thu, 1 Apr 2004 23:47:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8F5716A4CE for ; Thu, 1 Apr 2004 23:47:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABA1043D1D for ; Thu, 1 Apr 2004 23:47:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i327lGGe005336 for ; Thu, 1 Apr 2004 23:47:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i327lG98005333 for perforce@freebsd.org; Thu, 1 Apr 2004 23:47:16 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Thu, 1 Apr 2004 23:47:16 -0800 (PST) Message-Id: <200404020747.i327lG98005333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 50175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Apr 2004 07:47:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=50175 Change 50175 by marcel@marcel_nfs on 2004/04/01 23:46:31 Make alpha and sparc64 build again. Need to implement gdb_cpu_getreg() and gdb_cpu_setreg() in both cases. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/gdb_machdep.c#3 edit .. //depot/projects/gdb/sys/alpha/include/gdb_machdep.h#2 edit .. //depot/projects/gdb/sys/sparc64/include/gdb_machdep.h#3 edit .. //depot/projects/gdb/sys/sparc64/sparc64/gdb_machdep.c#3 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/gdb_machdep.c#3 (text+ko) ==== @@ -38,44 +38,20 @@ #include -uintmax_t -gdb_cpu_getreg(int regnum, struct trapframe *tf) +void * +gdb_cpu_getreg(int regnum, size_t *regsz) { + + *regsz = gdb_cpu_regsz(regnum); switch (regnum) { - case GDB_REG_FP: - break; - case GDB_REG_PC: - break; - case GDB_REG_SP: - break; } - return (0); -} - -ssize_t -gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) -{ - struct reg *r = buf; - - if (sizeof(*r) > bufsz) - return (-1); - bzero(r, sizeof(*r)); - return (sizeof(*r)); -} - -int -gdb_cpu_regsz(int regnum) -{ - return (8); /* XXX not really. */ + return (NULL); } void -gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) +gdb_cpu_setreg(int regnum, register_t val) { switch (regnum) { - case GDB_REG_FP: break; - case GDB_REG_PC: break; - case GDB_REG_SP: break; } } @@ -113,13 +89,3 @@ } return (SIGILL); } - -void -gdb_cpu_singlestep(int on, struct trapframe *tf) -{ -} - -void -gdb_cpu_trap(int entry, int code, struct trapframe *tf) -{ -} ==== //depot/projects/gdb/sys/alpha/include/gdb_machdep.h#2 (text+ko) ==== @@ -30,9 +30,23 @@ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 600 +#define GDB_NREGS 67 +#define GDB_REG_PC 64 + +static __inline size_t +gdb_cpu_regsz(int regnum) +{ + return (sizeof(long)); +} + +static __inline int +gdb_cpu_query(void) +{ + return (0); +} -#define GDB_REG_FP 328 -#define GDB_REG_PC 331 -#define GDB_REG_SP 12 +void *gdb_cpu_getreg(int, size_t *); +void gdb_cpu_setreg(int, register_t); +int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/sparc64/include/gdb_machdep.h#3 (text+ko) ==== @@ -30,9 +30,28 @@ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 600 +#define GDB_NREGS 462 +#define GDB_REG_PC 80 -#define GDB_REG_FP 30 -#define GDB_REG_PC 80 -#define GDB_REG_SP 14 +static __inline size_t +gdb_cpu_regsz(int regnum) +{ + return (sizeof(long)); /* XXX not really. */ +} + +static __inline int +gdb_cpu_query(void) +{ + return (0); +} + +static __inline int +gdb_cpu_signal(int vector, int _) +{ + return (vector); +} + +void *gdb_cpu_getreg(int, size_t *); +void gdb_cpu_setreg(int, register_t); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ ==== //depot/projects/gdb/sys/sparc64/sparc64/gdb_machdep.c#3 (text+ko) ==== @@ -38,62 +38,19 @@ #include -uintmax_t -gdb_cpu_getreg(int regnum, struct trapframe *tf) +void * +gdb_cpu_getreg(int regnum, size_t *regsz) { + + *regsz = gdb_cpu_regsz(regnum); switch (regnum) { - case GDB_REG_FP: - break; - case GDB_REG_PC: - break; - case GDB_REG_SP: - break; } - return (0); + return (NULL); } -ssize_t -gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) -{ - struct reg *r = buf; - - if (sizeof(*r) > bufsz) - return (-1); - bzero(r, sizeof(*r)); - return (sizeof(*r)); -} - -int -gdb_cpu_regsz(int regnum) -{ - return (8); /* XXX not really. */ -} - void -gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) +gdb_cpu_setreg(int regnum, register_t val) { switch (regnum) { - case GDB_REG_FP: break; - case GDB_REG_PC: break; - case GDB_REG_SP: break; } } - -int -gdb_cpu_signal(int type, int dummy) -{ - return (type); -} - -void -gdb_cpu_singlestep(int on, struct trapframe *tf) -{ - /* XXX dunno. */ - TF_DONE(tf); -} - -void -gdb_cpu_trap(int type, int dummy, struct trapframe *tf) -{ - flushw(); -}