From 946422b6a113063b9bbd72832ed13d4694134597 Mon Sep 17 00:00:00 2001 From: Mihails Strasuns Date: Fri, 14 Feb 2020 11:33:41 +0100 Subject: [PATCH] [gdb/testsuite] share jit-protocol.h by all jit tests There was an existing jit-protocol.h defining common symbols needed for JIT-supporting application, however, it was only used by few tests. Others redeclared the same symbols. This unifies all tests to use jit-protocol.h gdb/testsuite/ChangeLog: 2020-02-18 Mihails Strasuns * gdb.base/jit-attach-pie.c: Use jit-protocol.h. * gdb.base/jit-elf-main.c: Use jit-protocol.h. * gdb.base/jit-reader-host.c: Use jit-protocol.h. * gdb.base/jit-reader-simple-jit.c: Use jit-protocol.h. * gdb.base/jit-protocol.h: Update definitions to match all usage contexts. --- gdb/testsuite/gdb.base/jit-attach-pie.c | 24 +----------- gdb/testsuite/gdb.base/jit-elf-main.c | 38 ++----------------- gdb/testsuite/gdb.base/jit-protocol.h | 8 +++- gdb/testsuite/gdb.base/jit-reader-host.c | 3 -- .../gdb.base/jit-reader-simple-jit.c | 25 +----------- 5 files changed, 13 insertions(+), 85 deletions(-) diff --git a/gdb/testsuite/gdb.base/jit-attach-pie.c b/gdb/testsuite/gdb.base/jit-attach-pie.c index 55a03f73ae3..fd082335216 100644 --- a/gdb/testsuite/gdb.base/jit-attach-pie.c +++ b/gdb/testsuite/gdb.base/jit-attach-pie.c @@ -19,29 +19,7 @@ #include #include -struct jit_code_entry -{ - struct jit_code_entry *next_entry; - struct jit_code_entry *prev_entry; - const char *symfile_addr; - uint64_t symfile_size; -}; - -struct jit_descriptor -{ - uint32_t version; - /* This type should be jit_actions_t, but we use uint32_t - to be explicit about the bitwidth. */ - uint32_t action_flag; - struct jit_code_entry *relevant_entry; - struct jit_code_entry *first_entry; -}; - -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; - -void __jit_debug_register_code() -{ -} +#include "jit-protocol.h" static void * thread_proc (void *arg) diff --git a/gdb/testsuite/gdb.base/jit-elf-main.c b/gdb/testsuite/gdb.base/jit-elf-main.c index 37c2a31b3f2..4eaac514b53 100644 --- a/gdb/testsuite/gdb.base/jit-elf-main.c +++ b/gdb/testsuite/gdb.base/jit-elf-main.c @@ -29,6 +29,8 @@ #include #include +#include "jit-protocol.h" + /* ElfW is coming from linux. On other platforms it does not exist. Let us define it here. */ #ifndef ElfW @@ -42,38 +44,6 @@ #define _ElfW_1(e,w,t) e##w##t #endif /* !ElfW */ -typedef enum -{ - JIT_NOACTION = 0, - JIT_REGISTER_FN, - JIT_UNREGISTER_FN -} jit_actions_t; - -struct jit_code_entry -{ - struct jit_code_entry *next_entry; - struct jit_code_entry *prev_entry; - const char *symfile_addr; - uint64_t symfile_size; -}; - -struct jit_descriptor -{ - uint32_t version; - /* This type should be jit_actions_t, but we use uint32_t - to be explicit about the bitwidth. */ - uint32_t action_flag; - struct jit_code_entry *relevant_entry; - struct jit_code_entry *first_entry; -}; - -/* GDB puts a breakpoint in this function. */ -void __attribute__((noinline)) __jit_debug_register_code () { } - -/* Make sure to specify the version statically, because the - debugger may check the version before we can set it. */ -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; - static void usage (const char *const argv0) { @@ -203,7 +173,7 @@ MAIN (int argc, char *argv[]) __jit_debug_descriptor.first_entry = entry; /* Notify GDB. */ - __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.action_flag = JIT_REGISTER; __jit_debug_register_code (); } @@ -225,7 +195,7 @@ MAIN (int argc, char *argv[]) __jit_debug_descriptor.first_entry = NULL; /* Notify GDB. */ - __jit_debug_descriptor.action_flag = JIT_UNREGISTER_FN; + __jit_debug_descriptor.action_flag = JIT_UNREGISTER; __jit_debug_register_code (); __jit_debug_descriptor.relevant_entry = prev_entry; diff --git a/gdb/testsuite/gdb.base/jit-protocol.h b/gdb/testsuite/gdb.base/jit-protocol.h index 458523e5ff6..2b2e902fe7c 100644 --- a/gdb/testsuite/gdb.base/jit-protocol.h +++ b/gdb/testsuite/gdb.base/jit-protocol.h @@ -38,7 +38,7 @@ struct jit_code_entry { struct jit_code_entry *next_entry; struct jit_code_entry *prev_entry; - void *symfile_addr; + const void *symfile_addr; uint64_t symfile_size; }; @@ -51,4 +51,10 @@ struct jit_descriptor struct jit_code_entry *first_entry; }; +struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; + +void __attribute__((noinline)) __jit_debug_register_code() +{ +} + #endif /* JIT_PROTOCOL_H */ diff --git a/gdb/testsuite/gdb.base/jit-reader-host.c b/gdb/testsuite/gdb.base/jit-reader-host.c index d07acd54bb1..f9c4833083a 100644 --- a/gdb/testsuite/gdb.base/jit-reader-host.c +++ b/gdb/testsuite/gdb.base/jit-reader-host.c @@ -26,9 +26,6 @@ #include "jit-reader-host.h" #include "jit-protocol.h" -void __attribute__((noinline)) __jit_debug_register_code () { } - -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; struct jit_code_entry only_entry; typedef void (jit_function_stack_mangle_t) (void); diff --git a/gdb/testsuite/gdb.base/jit-reader-simple-jit.c b/gdb/testsuite/gdb.base/jit-reader-simple-jit.c index 407666b98bf..f446bf2d96d 100644 --- a/gdb/testsuite/gdb.base/jit-reader-simple-jit.c +++ b/gdb/testsuite/gdb.base/jit-reader-simple-jit.c @@ -19,32 +19,9 @@ #include -struct jit_code_entry -{ - struct jit_code_entry *next_entry; - struct jit_code_entry *prev_entry; - const char *symfile_addr; - uint64_t symfile_size; -}; - -struct jit_descriptor -{ - uint32_t version; - /* This type should be jit_actions_t, but we use uint32_t - to be explicit about the bitwidth. */ - uint32_t action_flag; - struct jit_code_entry *relevant_entry; - struct jit_code_entry *first_entry; -}; - #ifdef SPACER /* This exists to change the address of __jit_debug_descriptor. */ int spacer = 4; #endif -struct jit_descriptor __jit_debug_descriptor = { 1, 0, 0, 0 }; - -void -__jit_debug_register_code (void) -{ -} +#include "jit-protocol.h" \ No newline at end of file -- 2.30.2