From 9bb9e8ade770027f5cced2856574e2d317b15254 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 14 May 2009 09:37:00 +0000 Subject: Remove all i386 debug register low level macros in config nm files. (I386_DR_LOW_SET_ADDR, I386_DR_LOW_RESET_ADDR): Remove. (I386_DR_LOW_GET_STATUS, I386_DR_LOW_SET_CONTROL): Remove. (I386_USE_GENERIC_WATCHPOIINTS): Remove. * i386-nat.h: New file (adapted from config/i386/nm-i386.h). (struct i386_dr_low_type): New type. (i386_dr_low): New global variable. * i386-nat.c (TARGET_HAS_DR_LEN_8): Update macro. (i386_insert_aligned_watchpoint): Replace i386 dr low macros by i386_dr_low struct variable fields. (i386_remove_aligned_watchpoint): Likewise. (i386_stopped_data_address): Likewise. (i386_stopped_by_hwbp): Likewise. (show_debug_regs_command_added): New static variable. (add_show_debug_regs_command): New static function. (i386_use_watchpoints): Call add_show_debug_regs_command if not done. (i386_set_debug_register_length): New function. (_initialize_i386_nat): Delete. * amd64-linux-nat.c: Include "i386-nat.h". (amd64_linux_dr_set_control): Change to static. (amd64_linux_dr_get_status): Change to static. (amd64_linux_dr_set_addr,amd64_linux_dr_reset_addr): Likewise. (_initialize_amd64_linux_nat): Set i386_dr_low variable fields. * go32-nat.c: Include "i386-nat.h". (go32_set_addr): Change to static. (go32_set_dr7): Change to static. Change arg type to unisgned long. (go32_get_dr6): Change to static. Change return type to unisnged long. (init_go32_ops): Set i386_dr_low variable fields. * i386-linux-nat.c: Include "i386-nat.h". (i386_linux_dr_set_control, i386_linux_dr_get_status): Change to static. (i386_linux_dr_set_addr, i386_linux_dr_reset_addr): Idem. (_initialize_i386_linux_nat): Set i386_dr_low variable fields. * i386bsd-nat.h: Declare functions used for i386_dr_low fields in i386fbsd-nat.c. * i386fbsd-nat.c: Include "i386-nat.h". (_initialize_i386fbsd_nat): Set i386_dr_low variable fields. * windows-nat.c: Include "i386-nat.h". (cygwin_set_dr, cygwin_get_dr6, cygwin_set_dr7): Add prototypes. Change to static. (cygwin_get_dr6): Change return type to unisnged long. (cygwin_set_dr7): Change arg type to unisgned long. (init_windows_ops): Set i386_dr_low function fields. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Call i386_set_debug_register_length. * i386-windows-nat.c (_initialize_i386_windows_nat): Likewise. * config/i386/nm-cygwin.h: Remove all I386_* macros. * config/i386/nm-cygwin64.h: Likewise. * config/i386/nm-fbsd.h: Likewise. * config/i386/nm-linux.h: Likewise. * config/i386/nm-i386.h: Remove completely. * config/i386/nm-go32.h: Remove completely. * config/i386/nm-linux64.h: Remove completely. * config/i386/go32.mh (NAT_FILE): Remove entry. * config/i386/linux64.h (NAT_FILE): Change to config/nm-linux.h. --- gdb/go32-nat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gdb/go32-nat.c') diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c index 0f525bf1ca..5af281959b 100644 --- a/gdb/go32-nat.c +++ b/gdb/go32-nat.c @@ -85,6 +85,7 @@ #include #include "defs.h" +#include "i386-nat.h" #include "inferior.h" #include "gdbthread.h" #include "gdb_wait.h" @@ -768,7 +769,7 @@ go32_can_run (void) /* Pass the address ADDR to the inferior in the I'th debug register. Here we just store the address in D_REGS, the watchpoint will be actually set up when go32_wait runs the debuggee. */ -void +static void go32_set_dr (int i, CORE_ADDR addr) { if (i < 0 || i > 3) @@ -780,8 +781,8 @@ go32_set_dr (int i, CORE_ADDR addr) /* Pass the value VAL to the inferior in the DR7 debug control register. Here we just store the address in D_REGS, the watchpoint will be actually set up when go32_wait runs the debuggee. */ -void -go32_set_dr7 (unsigned val) +static void +go32_set_dr7 (unsigned long val) { CONTROL = val; } @@ -789,7 +790,7 @@ go32_set_dr7 (unsigned val) /* Get the value of the DR6 debug status register from the inferior. Here we just return the value stored in D_REGS, as we've got it from the last go32_wait call. */ -unsigned +static unsigned long go32_get_dr6 (void) { return STATUS; @@ -975,6 +976,13 @@ init_go32_ops (void) i386_use_watchpoints (&go32_ops); + + i386_dr_low.set_control = go32_set_dr7; + i386_dr_low.set_addr = go32_set_dr; + i386_dr_low.reset_addr = NULL; + i386_dr_low.get_status = go32_get_dr6; + i386_set_debug_register_length (4); + go32_ops.to_magic = OPS_MAGIC; /* Initialize child's cwd as empty to be initialized when starting -- cgit v1.2.1