From 8bddcf98b7053ce760e83bef04b824ab2c6e79be Mon Sep 17 00:00:00 2001 From: Nicholas Duffek Date: Fri, 7 Apr 2000 01:14:10 +0000 Subject: * sol-thread.c (GET_LWP, GET_THREAD, BUILD_LWP, BUILD_THREAD): Change to rely on PIDGET etc. * config/i386/nm-i386sol2.h (TARGET_HAS_WATCHPOINTS, TARGET_CAN_USE_HARDWARE_WATCHPOINT, HAVE_CONTINUABLE_WATCHPOINT, STOPPED_BY_WATCHPOINT, target_[insert/remove]_watchpoint): define. Allow target to use procfs hardware watchpoints. * config/sparc/nm-sun4sol2.h: ditto. * config/i386/tm-i386sol2.h (PIDGET, TIDGET, MERGEPID): modify definitions to use 16 bits for the pid, 15 bits for the tid, and 1 bit for the flag. * config/sparc/tm-sun4sol2.h: ditto. (SOFTWARE_SINGLE_STEP, SOFTWARE_SINGLE_STEP_P): undefine. * testsuite/gdb.threads/pthreads.exp (all_threads_running): Allow for more than 15 thread increments. --- gdb/config/sparc/nm-sun4sol2.h | 28 ++++++++++++++++++++++++++++ gdb/config/sparc/tm-sun4sol2.h | 13 +++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) (limited to 'gdb/config/sparc') diff --git a/gdb/config/sparc/nm-sun4sol2.h b/gdb/config/sparc/nm-sun4sol2.h index 6e9e74fbf26..9d5dd1deec3 100644 --- a/gdb/config/sparc/nm-sun4sol2.h +++ b/gdb/config/sparc/nm-sun4sol2.h @@ -30,3 +30,31 @@ #define PRSVADDR_BROKEN +#ifdef NEW_PROC_API /* Solaris 6 and above can do HW watchpoints */ + +#define TARGET_HAS_HARDWARE_WATCHPOINTS + +/* The man page for proc4 on solaris 6 and 7 says that the system + can support "thousands" of hardware watchpoints, but gives no + method for finding out how many. So just tell GDB 'yes'. */ +#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(TYPE, CNT, OT) 1 + +/* When a hardware watchpoint fires off the PC will be left at the + instruction following the one which caused the watchpoint. + It will *NOT* be necessary for GDB to step over the watchpoint. */ +#define HAVE_CONTINUABLE_WATCHPOINT + +extern int procfs_stopped_by_watchpoint PARAMS ((int)); +#define STOPPED_BY_WATCHPOINT(W) \ + procfs_stopped_by_watchpoint(inferior_pid) + +/* Use these macros for watchpoint insertion/deletion. */ +/* type can be 0: write watch, 1: read watch, 2: access watch (read/write) */ + +extern int procfs_set_watchpoint PARAMS ((int, CORE_ADDR, int, int, int)); +#define target_insert_watchpoint(ADDR, LEN, TYPE) \ + procfs_set_watchpoint (inferior_pid, ADDR, LEN, TYPE, 1) +#define target_remove_watchpoint(ADDR, LEN, TYPE) \ + procfs_set_watchpoint (inferior_pid, ADDR, 0, 0, 0) + +#endif /* NEW_PROC_API */ diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h index e348f79d3b9..a432d612463 100644 --- a/gdb/config/sparc/tm-sun4sol2.h +++ b/gdb/config/sparc/tm-sun4sol2.h @@ -22,6 +22,11 @@ #include "sparc/tm-sparc.h" #include "tm-sysv4.h" +/* With Sol2 it is no longer necessary to enable software single-step, + since the /proc interface can take care of it for us in hardware. */ +#undef SOFTWARE_SINGLE_STEP +#undef SOFTWARE_SINGLE_STEP_P + /* There are two different signal handler trampolines in Solaris2. */ #define IN_SIGTRAMP(pc, name) \ ((name) \ @@ -33,7 +38,7 @@ ucbsigvechandler. */ #define SIGCONTEXT_PC_OFFSET 44 -#if 0 /* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */ +#if 0 /* FIXME Setjmp/longjmp are not as well doc'd in SunOS 5.x yet */ /* Offsets into jmp_buf. Not defined by Sun, but at least documented in a comment in ! */ @@ -76,6 +81,6 @@ extern char *sunpro_static_transform_name PARAMS ((char *)); #define HANDLE_SVR4_EXEC_EMULATORS /* Macros to extract process id and thread id from a composite pid/tid */ -#define PIDGET(pid) ((pid) & 0xffff) -#define TIDGET(pid) (((pid) >> 16) & 0xffff) -#define MERGEPID(pid, tid) (((tid) << 16) | (pid)) +#define PIDGET(PID) (((PID) & 0xffff)) +#define TIDGET(PID) (((PID) & 0x7fffffff) >> 16) +#define MERGEPID(PID, TID) (((PID) & 0xffff) | ((TID) << 16)) -- cgit v1.2.1