From cc4d742f4ce05bf933397a513b953c0feeae0663 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 22 Sep 2017 16:51:55 +0200 Subject: [PATCH] gdbserver x86 on win32: call init_target_desc When trying to run gdbserver compiled for x86 win32 under wine, I get: $ wine ./gdbserver/gdbserver.exe --once :1234 ./test /home/emaisin/src/binutils-gdb/gdb/gdbserver/regcache.c:177: A problem internal to GDBserver has been detected. regcache* new_register_cache(const target_desc*): Assertion `tdesc->registers_size != 0' failed. It seems like on that platform, init_target_desc is never called, so registers_size is never computed. My first thought was to call init_target_desc somewhere in win32-low.c, but it turns out that when using win32 on arm, the target description is already initialized by the generated code. My second thought was to call it in {i386,amd64}_create_target_description, but those functions are shared with GDB, and init_target_desc is gdbserver-specific. So I ended up with the simplest fix, calling it in i386_arch_setup. Now I hit some other problem: $ wine ./gdbserver/gdbserver.exe --once :1234 ./test Killing process(es): 39 No program to debug Exiting but still, I think fixing the tdesc issue this is a step forward. gdb/gdbserver/ChangeLog: * win32-i386-low.c (i386_arch_setup): Call init_target_desc. --- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/win32-i386-low.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 75d97f05b4c..a82dd863906 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2017-09-22 Simon Marchi + + * win32-i386-low.c (i386_arch_setup): Call init_target_desc. + 2017-09-21 Kevin Buettner * linux-low.h (struct lwp_info): Add new field, thread_handle. diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c index 4361d82fb0a..03d6e1779d4 100644 --- a/gdb/gdbserver/win32-i386-low.c +++ b/gdb/gdbserver/win32-i386-low.c @@ -23,6 +23,7 @@ #include "arch/amd64.h" #endif #include "arch/i386.h" +#include "tdesc.h" #ifndef CONTEXT_EXTENDED_REGISTERS #define CONTEXT_EXTENDED_REGISTERS 0 @@ -443,12 +444,18 @@ static const unsigned char i386_win32_breakpoint = 0xcc; static void i386_arch_setup (void) { + struct target_desc *tdesc; + #ifdef __x86_64__ - win32_tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false, + tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false, false); #else - win32_tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false); + 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 = { -- 2.30.2