X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fwin32-i386-low.c;h=5daa8636bc282def02cef6174f740363c3cc9dc2;hb=476350ba4800f1144b125f6511a5e25b223cc90b;hp=39149f37a9eeb3196db0fb8d2aa958b7d5fbdbe8;hpb=f7160e97410b4b65330e5f23d82e8879c908de50;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index 39149f37a9..5daa8636bc 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2014 Free Software Foundation, Inc. +/* Copyright (C) 2007-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -17,7 +17,7 @@ #include "server.h" #include "win32-low.h" -#include "i386-low.h" +#include "x86-low.h" #ifndef CONTEXT_EXTENDED_REGISTERS #define CONTEXT_EXTENDED_REGISTERS 0 @@ -38,70 +38,112 @@ void init_registers_i386 (void); extern const struct target_desc *tdesc_i386; #endif -static struct i386_debug_reg_state debug_reg_state; +static struct x86_debug_reg_state debug_reg_state; -static int debug_registers_changed = 0; -static int debug_registers_used = 0; +static int +update_debug_registers_callback (struct inferior_list_entry *entry, + void *pid_p) +{ + struct thread_info *thr = (struct thread_info *) entry; + win32_thread_info *th = (win32_thread_info *) inferior_target_data (thr); + int pid = *(int *) pid_p; + + /* Only update the threads of this process. */ + if (pid_of (thr) == pid) + { + /* The actual update is done later just before resuming the lwp, + we just mark that the registers need updating. */ + th->debug_registers_changed = 1; + } + + return 0; +} /* Update the inferior's debug register REGNUM from STATE. */ static void -i386_dr_low_set_addr (int regnum, CORE_ADDR addr) +x86_dr_low_set_addr (int regnum, CORE_ADDR addr) { + /* Only update the threads of this process. */ + int pid = pid_of (current_thread); + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); - /* debug_reg_state.dr_mirror is already set. - Just notify i386_set_thread_context, i386_thread_added - that the registers need to be updated. */ - debug_registers_changed = 1; - debug_registers_used = 1; + find_inferior (&all_threads, update_debug_registers_callback, &pid); } -static CORE_ADDR -i386_dr_low_get_addr (int regnum) +/* Update the inferior's DR7 debug control register from STATE. */ + +static void +x86_dr_low_set_control (unsigned long control) { - gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + /* Only update the threads of this process. */ + int pid = pid_of (current_thread); - return debug_reg_state.dr_mirror[regnum]; + find_inferior (&all_threads, update_debug_registers_callback, &pid); } -/* Update the inferior's DR7 debug control register from STATE. */ +/* Return the current value of a DR register of the current thread's + context. */ -static void -i386_dr_low_set_control (unsigned long control) +static DWORD64 +win32_get_current_dr (int dr) +{ + win32_thread_info *th + = (win32_thread_info *) inferior_target_data (current_thread); + + win32_require_context (th); + +#define RET_DR(DR) \ + case DR: \ + return th->context.Dr ## DR + + switch (dr) + { + RET_DR (0); + RET_DR (1); + RET_DR (2); + RET_DR (3); + RET_DR (6); + RET_DR (7); + } + +#undef RET_DR + + gdb_assert_not_reached ("unhandled dr"); +} + +static CORE_ADDR +x86_dr_low_get_addr (int regnum) { - /* debug_reg_state.dr_control_mirror is already set. - Just notify i386_set_thread_context, i386_thread_added - that the registers need to be updated. */ - debug_registers_changed = 1; - debug_registers_used = 1; + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + + return win32_get_current_dr (regnum - DR_FIRSTADDR); } static unsigned long -i386_dr_low_get_control (void) +x86_dr_low_get_control (void) { - return debug_reg_state.dr_control_mirror; + return win32_get_current_dr (7); } /* Get the value of the DR6 debug status register from the inferior and record it in STATE. */ static unsigned long -i386_dr_low_get_status (void) +x86_dr_low_get_status (void) { - /* We don't need to do anything here, the last call to thread_rec for - current_event.dwThreadId id has already set it. */ - return debug_reg_state.dr_status_mirror; + return win32_get_current_dr (6); } /* Low-level function vector. */ -struct i386_dr_low_type i386_dr_low = +struct x86_dr_low_type x86_dr_low = { - i386_dr_low_set_control, - i386_dr_low_set_addr, - i386_dr_low_get_addr, - i386_dr_low_get_status, - i386_dr_low_get_control, + x86_dr_low_set_control, + x86_dr_low_set_addr, + x86_dr_low_get_addr, + x86_dr_low_get_status, + x86_dr_low_get_control, sizeof (void *), }; @@ -132,8 +174,8 @@ i386_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, enum target_hw_bp_type hw_type = raw_bkpt_type_to_target_hw_bp_type (type); - return i386_dr_insert_watchpoint (&debug_reg_state, - hw_type, addr, size); + return x86_dr_insert_watchpoint (&debug_reg_state, + hw_type, addr, size); } default: /* Unsupported. */ @@ -153,8 +195,8 @@ i386_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, enum target_hw_bp_type hw_type = raw_bkpt_type_to_target_hw_bp_type (type); - return i386_dr_remove_watchpoint (&debug_reg_state, - hw_type, addr, size); + return x86_dr_remove_watchpoint (&debug_reg_state, + hw_type, addr, size); } default: /* Unsupported. */ @@ -163,16 +205,16 @@ i386_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, } static int -i386_stopped_by_watchpoint (void) +x86_stopped_by_watchpoint (void) { - return i386_dr_stopped_by_watchpoint (&debug_reg_state); + return x86_dr_stopped_by_watchpoint (&debug_reg_state); } static CORE_ADDR -i386_stopped_data_address (void) +x86_stopped_data_address (void) { CORE_ADDR addr; - if (i386_dr_stopped_data_address (&debug_reg_state, &addr)) + if (x86_dr_stopped_data_address (&debug_reg_state, &addr)) return addr; return 0; } @@ -180,13 +222,11 @@ i386_stopped_data_address (void) static void i386_initial_stuff (void) { - i386_low_init_dregs (&debug_reg_state); - debug_registers_changed = 0; - debug_registers_used = 0; + x86_low_init_dregs (&debug_reg_state); } static void -i386_get_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event) +i386_get_thread_context (win32_thread_info *th) { /* Requesting the CONTEXT_EXTENDED_REGISTERS register set fails if the system doesn't support extended registers. */ @@ -210,28 +250,17 @@ i386_get_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event) error ("GetThreadContext failure %ld\n", (long) e); } - - debug_registers_changed = 0; - - if (th->tid == current_event->dwThreadId) - { - /* Copy dr values from the current thread. */ - struct i386_debug_reg_state *dr = &debug_reg_state; - dr->dr_mirror[0] = th->context.Dr0; - dr->dr_mirror[1] = th->context.Dr1; - dr->dr_mirror[2] = th->context.Dr2; - dr->dr_mirror[3] = th->context.Dr3; - dr->dr_status_mirror = th->context.Dr6; - dr->dr_control_mirror = th->context.Dr7; - } } static void -i386_set_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event) +i386_prepare_to_resume (win32_thread_info *th) { - if (debug_registers_changed) + if (th->debug_registers_changed) { - struct i386_debug_reg_state *dr = &debug_reg_state; + struct x86_debug_reg_state *dr = &debug_reg_state; + + win32_require_context (th); + th->context.Dr0 = dr->dr_mirror[0]; th->context.Dr1 = dr->dr_mirror[1]; th->context.Dr2 = dr->dr_mirror[2]; @@ -239,32 +268,15 @@ i386_set_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event) /* th->context.Dr6 = dr->dr_status_mirror; FIXME: should we set dr6 also ?? */ th->context.Dr7 = dr->dr_control_mirror; - } - SetThreadContext (th->h, &th->context); + th->debug_registers_changed = 0; + } } static void i386_thread_added (win32_thread_info *th) { - /* Set the debug registers for the new thread if they are used. */ - if (debug_registers_used) - { - struct i386_debug_reg_state *dr = &debug_reg_state; - th->context.ContextFlags = CONTEXT_DEBUG_REGISTERS; - GetThreadContext (th->h, &th->context); - - th->context.Dr0 = dr->dr_mirror[0]; - th->context.Dr1 = dr->dr_mirror[1]; - th->context.Dr2 = dr->dr_mirror[2]; - th->context.Dr3 = dr->dr_mirror[3]; - /* th->context.Dr6 = dr->dr_status_mirror; - FIXME: should we set dr6 also ?? */ - th->context.Dr7 = dr->dr_control_mirror; - - SetThreadContext (th->h, &th->context); - th->context.ContextFlags = 0; - } + th->debug_registers_changed = 1; } static void @@ -450,7 +462,7 @@ struct win32_target_ops the_low_target = { sizeof (mappings) / sizeof (mappings[0]), i386_initial_stuff, i386_get_thread_context, - i386_set_thread_context, + i386_prepare_to_resume, i386_thread_added, i386_fetch_inferior_register, i386_store_inferior_register, @@ -460,6 +472,6 @@ struct win32_target_ops the_low_target = { i386_supports_z_point_type, i386_insert_point, i386_remove_point, - i386_stopped_by_watchpoint, - i386_stopped_data_address + x86_stopped_by_watchpoint, + x86_stopped_data_address };