X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fwin32-i386-low.c;h=1961a9827fb60263fe06ebd211a8a9bcf86f21dc;hb=f00a2de2a7556c59bce93f7ced44afa8e1bbf7c3;hp=7e058a58b564866122d4ea07845a257833e92b88;hpb=aa5ca48fad05503860c254806750c8a304ec9fc5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index 7e058a58b5..1961a9827f 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2007-2017 Free Software Foundation, Inc. This file is part of GDB. @@ -17,70 +17,149 @@ #include "server.h" #include "win32-low.h" -#include "i386-low.h" +#include "x86-low.h" +#include "x86-xstate.h" +#ifdef __x86_64__ +#include "arch/amd64.h" +#endif +#include "arch/i386.h" +#include "tdesc.h" + +#ifndef CONTEXT_EXTENDED_REGISTERS +#define CONTEXT_EXTENDED_REGISTERS 0 +#endif #define FCS_REGNUM 27 #define FOP_REGNUM 31 #define FLAG_TRACE_BIT 0x100 -/* Defined in auto-generated file reg-i386.c. */ -void init_registers_i386 (void); +static struct x86_debug_reg_state debug_reg_state; -static struct i386_debug_reg_state debug_reg_state; +static void +update_debug_registers (thread_info *thread) +{ + win32_thread_info *th = (win32_thread_info *) thread_target_data (thread); -static int debug_registers_changed = 0; -static int debug_registers_used = 0; + /* The actual update is done later just before resuming the lwp, + we just mark that the registers need updating. */ + th->debug_registers_changed = 1; +} /* Update the inferior's debug register REGNUM from STATE. */ -void -i386_dr_low_set_addr (const struct i386_debug_reg_state *state, int regnum) +static void +x86_dr_low_set_addr (int regnum, CORE_ADDR addr) { - if (! (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR)) - fatal ("Invalid debug register %d", regnum); - - /* 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; + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + + /* Only update the threads of this process. */ + for_each_thread (current_thread->id.pid (), update_debug_registers); } /* Update the inferior's DR7 debug control register from STATE. */ -void -i386_dr_low_set_control (const struct i386_debug_reg_state *state) +static void +x86_dr_low_set_control (unsigned long control) { - /* 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; + /* Only update the threads of this process. */ + for_each_thread (current_thread->id.pid (), update_debug_registers); +} + +/* Return the current value of a DR register of the current thread's + context. */ + +static DWORD64 +win32_get_current_dr (int dr) +{ + win32_thread_info *th + = (win32_thread_info *) thread_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) +{ + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + + return win32_get_current_dr (regnum - DR_FIRSTADDR); +} + +static unsigned long +x86_dr_low_get_control (void) +{ + return win32_get_current_dr (7); } /* Get the value of the DR6 debug status register from the inferior and record it in STATE. */ -void -i386_dr_low_get_status (struct i386_debug_reg_state *state) +static unsigned long +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 win32_get_current_dr (6); } -/* Watchpoint support. */ +/* Low-level function vector. */ +struct x86_dr_low_type x86_dr_low = + { + 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 *), + }; + +/* Breakpoint/watchpoint support. */ + +static int +i386_supports_z_point_type (char z_type) +{ + switch (z_type) + { + case Z_PACKET_WRITE_WP: + case Z_PACKET_ACCESS_WP: + return 1; + default: + return 0; + } +} static int -i386_insert_point (char type, CORE_ADDR addr, int len) +i386_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, struct raw_breakpoint *bp) { switch (type) { - case '2': - case '3': - case '4': - return i386_low_insert_watchpoint (&debug_reg_state, - type, addr, len); + case raw_bkpt_type_write_wp: + case raw_bkpt_type_access_wp: + { + enum target_hw_bp_type hw_type + = raw_bkpt_type_to_target_hw_bp_type (type); + + return x86_dr_insert_watchpoint (&debug_reg_state, + hw_type, addr, size); + } default: /* Unsupported. */ return 1; @@ -88,15 +167,20 @@ i386_insert_point (char type, CORE_ADDR addr, int len) } static int -i386_remove_point (char type, CORE_ADDR addr, int len) +i386_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, struct raw_breakpoint *bp) { switch (type) { - case '2': - case '3': - case '4': - return i386_low_remove_watchpoint (&debug_reg_state, - type, addr, len); + case raw_bkpt_type_write_wp: + case raw_bkpt_type_access_wp: + { + enum target_hw_bp_type hw_type + = raw_bkpt_type_to_target_hw_bp_type (type); + + return x86_dr_remove_watchpoint (&debug_reg_state, + hw_type, addr, size); + } default: /* Unsupported. */ return 1; @@ -104,16 +188,16 @@ i386_remove_point (char type, CORE_ADDR addr, int len) } static int -i386_stopped_by_watchpoint (void) +x86_stopped_by_watchpoint (void) { - return i386_low_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_low_stopped_data_address (&debug_reg_state, &addr)) + if (x86_dr_stopped_data_address (&debug_reg_state, &addr)) return addr; return 0; } @@ -121,43 +205,45 @@ 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) { - th->context.ContextFlags = \ - CONTEXT_FULL | \ - CONTEXT_FLOATING_POINT | \ - CONTEXT_EXTENDED_REGISTERS | \ - CONTEXT_DEBUG_REGISTERS; + /* Requesting the CONTEXT_EXTENDED_REGISTERS register set fails if + the system doesn't support extended registers. */ + static DWORD extended_registers = CONTEXT_EXTENDED_REGISTERS; - GetThreadContext (th->h, &th->context); + again: + th->context.ContextFlags = (CONTEXT_FULL + | CONTEXT_FLOATING_POINT + | CONTEXT_DEBUG_REGISTERS + | extended_registers); - debug_registers_changed = 0; - - if (th->tid == current_event->dwThreadId) + if (!GetThreadContext (th->h, &th->context)) { - /* 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; + DWORD e = GetLastError (); + + if (extended_registers && e == ERROR_INVALID_PARAMETER) + { + extended_registers = 0; + goto again; + } + + error ("GetThreadContext failure %ld\n", (long) e); } } 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]; @@ -165,32 +251,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 @@ -199,6 +268,8 @@ i386_single_step (win32_thread_info *th) th->context.EFlags |= FLAG_TRACE_BIT; } +#ifndef __x86_64__ + /* An array of offset mappings into a Win32 Context structure. This is a one-to-one mapping which is indexed by gdb's register numbers. It retrieves an offset into the context structure where @@ -254,9 +325,79 @@ static const int mappings[] = { }; #undef context_offset +#else /* __x86_64__ */ + +#define context_offset(x) (offsetof (CONTEXT, x)) +static const int mappings[] = +{ + context_offset (Rax), + context_offset (Rbx), + context_offset (Rcx), + context_offset (Rdx), + context_offset (Rsi), + context_offset (Rdi), + context_offset (Rbp), + context_offset (Rsp), + context_offset (R8), + context_offset (R9), + context_offset (R10), + context_offset (R11), + context_offset (R12), + context_offset (R13), + context_offset (R14), + context_offset (R15), + context_offset (Rip), + context_offset (EFlags), + context_offset (SegCs), + context_offset (SegSs), + context_offset (SegDs), + context_offset (SegEs), + context_offset (SegFs), + context_offset (SegGs), + context_offset (FloatSave.FloatRegisters[0]), + context_offset (FloatSave.FloatRegisters[1]), + context_offset (FloatSave.FloatRegisters[2]), + context_offset (FloatSave.FloatRegisters[3]), + context_offset (FloatSave.FloatRegisters[4]), + context_offset (FloatSave.FloatRegisters[5]), + context_offset (FloatSave.FloatRegisters[6]), + context_offset (FloatSave.FloatRegisters[7]), + context_offset (FloatSave.ControlWord), + context_offset (FloatSave.StatusWord), + context_offset (FloatSave.TagWord), + context_offset (FloatSave.ErrorSelector), + context_offset (FloatSave.ErrorOffset), + context_offset (FloatSave.DataSelector), + context_offset (FloatSave.DataOffset), + context_offset (FloatSave.ErrorSelector) + /* XMM0-7 */ , + context_offset (Xmm0), + context_offset (Xmm1), + context_offset (Xmm2), + context_offset (Xmm3), + context_offset (Xmm4), + context_offset (Xmm5), + context_offset (Xmm6), + context_offset (Xmm7), + context_offset (Xmm8), + context_offset (Xmm9), + context_offset (Xmm10), + context_offset (Xmm11), + context_offset (Xmm12), + context_offset (Xmm13), + context_offset (Xmm14), + context_offset (Xmm15), + /* MXCSR */ + context_offset (FloatSave.MxCsr) +}; +#undef context_offset + +#endif /* __x86_64__ */ + /* Fetch register from gdbserver regcache data. */ static void -i386_fetch_inferior_register (win32_thread_info *th, int r) +i386_fetch_inferior_register (struct regcache *regcache, + win32_thread_info *th, int r) { char *context_offset = (char *) &th->context + mappings[r]; @@ -264,39 +405,61 @@ i386_fetch_inferior_register (win32_thread_info *th, int r) if (r == FCS_REGNUM) { l = *((long *) context_offset) & 0xffff; - supply_register (r, (char *) &l); + supply_register (regcache, r, (char *) &l); } else if (r == FOP_REGNUM) { l = (*((long *) context_offset) >> 16) & ((1 << 11) - 1); - supply_register (r, (char *) &l); + supply_register (regcache, r, (char *) &l); } else - supply_register (r, context_offset); + supply_register (regcache, r, context_offset); } /* Store a new register value into the thread context of TH. */ static void -i386_store_inferior_register (win32_thread_info *th, int r) +i386_store_inferior_register (struct regcache *regcache, + win32_thread_info *th, int r) { char *context_offset = (char *) &th->context + mappings[r]; - collect_register (r, context_offset); + collect_register (regcache, r, context_offset); +} + +static const unsigned char i386_win32_breakpoint = 0xcc; +#define i386_win32_breakpoint_len 1 + +static void +i386_arch_setup (void) +{ + struct target_desc *tdesc; + +#ifdef __x86_64__ + tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false, + false); +#else + tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false); +#endif + + init_target_desc (tdesc); + + win32_tdesc = tdesc; } struct win32_target_ops the_low_target = { - init_registers_i386, + i386_arch_setup, 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, i386_single_step, - NULL, /* breakpoint */ - 0, /* breakpoint_len */ + &i386_win32_breakpoint, + i386_win32_breakpoint_len, + 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 };