* [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface"
@ 2012-10-08 11:43 Sanjoy Das
2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das
` (2 more replies)
0 siblings, 3 replies; 24+ messages in thread
From: Sanjoy Das @ 2012-10-08 11:43 UTC (permalink / raw)
To: gdb-patches; +Cc: Sanjoy Das
Hi,
Sorry for hiatus, got a little busy with university exams. Here are
the fixed patches.
Changes from the last series:
Fix segfault when unwinding JIT frames using a custom reader.
<None>
Make jit-reader-load accept absolute paths to reader shared objects.
* Fixed nit in IS_ABSOLUTE_PATH invocation.
Add a test case for the jit-reader interface.
* jit_host_src and jit_host_bin use standard_testfile
* jit_reader_bin uses standard_output_file instead of a raw ${objdir}
Thanks!
--
Sanjoy
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-08 11:43 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das @ 2012-10-08 11:43 ` Sanjoy Das 2012-10-16 20:16 ` Tom Tromey 2012-10-17 16:29 ` Pedro Alves 2012-10-08 11:43 ` [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects Sanjoy Das 2012-10-08 11:43 ` [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader Sanjoy Das 2 siblings, 2 replies; 24+ messages in thread From: Sanjoy Das @ 2012-10-08 11:43 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das --- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 72 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 67 ++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 9 +++ gdb/testsuite/gdb.base/jitreader.c | 136 +++++++++++++++++++++++++++++++++ 5 files changed, 292 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4eb19bd..02f909e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: Do. + * gdb.base/jithost.h: Do. + * gdb.base/jitreader.c : Do. + 2012-10-06 Jan Kratochvil <jan.kratochvil@redhat.com> Fix crash during stepping on ppc32. diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..737d091 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,72 @@ +# Copyright 2011-2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +standard_testfile jithost.c + +if ![istarget x86_64-*-linux-gnu*] then { + untested jit-reader.exp + return -1; +} + +if {[skip_shlib_tests]} { + untested jit-reader.exp + return -1 +} + +if {[get_compiler_info]} { + warning "Could not get compiler info" + untested jit-reader.exp + return 1 +} + +set jit_host_src ${srcfile} +set jit_host_bin ${binfile} + +set include_dir ${objdir}/../../ + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +set jit_reader jitreader +set jit_reader_src ${jit_reader}.c +set jit_reader_bin [standard_output_file ${jit_reader}.so] + +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ + [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +proc jit_reader_test {} { + global jit_host_bin + global jit_reader_bin + global verbose + + clean_restart $jit_host_bin + + if {$verbose > 0} { + gdb_run_cmd "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" + gdb_run_cmd "run" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..967245c --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,67 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +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; + void *symfile_addr; + uint64_t symfile_size; +}; + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +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_t)(); + +int main(int argc, char **argv) +{ + char *code = mmap(NULL, getpagesize(), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; // Generate a SIGTRAP + code[1] = 0xc3; // RET + + struct jithost_abi *symfile = malloc(sizeof(struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof(struct jithost_abi); + + __jit_debug_descriptor.first_entry = + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code(); + + function(); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..37cf042 --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,9 @@ +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi { + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..2438b0d --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,136 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum RegisterMapping { + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state { + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs* self, + struct gdb_symbol_callbacks* cbs, + void* memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object* object = cbs->object_open (cbs); + struct gdb_symtab* symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value(struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof(struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +enum gdb_status +unwind_frame(struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + printf("Unwinding %p\n", (void *) this_ip); + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +void +destroy_reader(struct gdb_reader_funcs* self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs* gdb_init_reader(void) { + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das @ 2012-10-16 20:16 ` Tom Tromey 2012-10-17 16:16 ` Pedro Alves 2012-10-17 16:29 ` Pedro Alves 1 sibling, 1 reply; 24+ messages in thread From: Tom Tromey @ 2012-10-16 20:16 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches >>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: Sanjoy> +2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> Sanjoy> + Sanjoy> + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader Sanjoy> + interface. Sanjoy> + * gdb.base/jithost.c: Do. Sanjoy> + * gdb.base/jithost.h: Do. Sanjoy> + * gdb.base/jitreader.c : Do. Thanks very much for doing this. I was concerned that this test should be native-only, but then I noticed that skip_shlib_tests checks isnative. So, no worries there. Sanjoy> +set include_dir ${objdir}/../../ I think this should use standard_output_file. This patch is ok with this change. thanks, Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-16 20:16 ` Tom Tromey @ 2012-10-17 16:16 ` Pedro Alves 2012-10-17 16:27 ` Tom Tromey 0 siblings, 1 reply; 24+ messages in thread From: Pedro Alves @ 2012-10-17 16:16 UTC (permalink / raw) To: Tom Tromey; +Cc: Sanjoy Das, gdb-patches On 10/16/2012 09:15 PM, Tom Tromey wrote: >>>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: > > Sanjoy> +2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> > Sanjoy> + > Sanjoy> + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader > Sanjoy> + interface. > Sanjoy> + * gdb.base/jithost.c: Do. > Sanjoy> + * gdb.base/jithost.h: Do. > Sanjoy> + * gdb.base/jitreader.c : Do. > > Thanks very much for doing this. > > I was concerned that this test should be native-only, but then I noticed > that skip_shlib_tests checks isnative. So, no worries there. Hmm, confused. :-) # Return a 1 if we should skip shared library tests. proc skip_shlib_tests {} { # Run the shared library tests on native systems. if {[isnative]} { return 0 } This means that shlib tests are never skipped on native, but it doesn't prevent it from running elsewhere. Should the test be native-only? If so, why? Doesn't the jit interface work when debugging with remote targets (e.g., gdbserver)? > > Sanjoy> +set include_dir ${objdir}/../../ > > I think this should use standard_output_file. > > This patch is ok with this change. -- Pedro Alves ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-17 16:16 ` Pedro Alves @ 2012-10-17 16:27 ` Tom Tromey 2012-10-17 16:35 ` Pedro Alves 0 siblings, 1 reply; 24+ messages in thread From: Tom Tromey @ 2012-10-17 16:27 UTC (permalink / raw) To: Pedro Alves; +Cc: Sanjoy Das, gdb-patches >>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes: Pedro> This means that shlib tests are never skipped on native, but Pedro> it doesn't prevent it from running elsewhere. Oh, duh. Sanjoy, your test has to check isnative. Pedro> Should the test be native-only? If so, why? Doesn't the jit Pedro> interface work when debugging with remote targets (e.g., Pedro> gdbserver)? It does, but this tests the 'jit-reader-load' functionality, which means it must build a .so that gdb itself loads. 'isnative' isn't maybe exactly the right test -- you might have a build-x-host toolchain -- but it seems simplest. Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-17 16:27 ` Tom Tromey @ 2012-10-17 16:35 ` Pedro Alves 0 siblings, 0 replies; 24+ messages in thread From: Pedro Alves @ 2012-10-17 16:35 UTC (permalink / raw) To: Tom Tromey; +Cc: Sanjoy Das, gdb-patches On 10/17/2012 05:27 PM, Tom Tromey wrote: >>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes: > > Pedro> This means that shlib tests are never skipped on native, but > Pedro> it doesn't prevent it from running elsewhere. > > Oh, duh. > Sanjoy, your test has to check isnative. > > Pedro> Should the test be native-only? If so, why? Doesn't the jit > Pedro> interface work when debugging with remote targets (e.g., > Pedro> gdbserver)? > > It does, but this tests the 'jit-reader-load' functionality, which means > it must build a .so that gdb itself loads. 'isnative' isn't maybe > exactly the right test -- you might have a build-x-host toolchain -- but > it seems simplest. Ah, I see. We're talking about different "native's". Dejagnu's isnative only compares host vs target triplets. Indeed that sounds simplest. Bailing if !isnative will still run the tests if testing with a gdbserver of the triplet as the host (of which native gdbserver testing is a special case), so I'm happy with that. (We should still add a gdb_load_shlibs call.) -- Pedro Alves ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-10-16 20:16 ` Tom Tromey @ 2012-10-17 16:29 ` Pedro Alves 1 sibling, 0 replies; 24+ messages in thread From: Pedro Alves @ 2012-10-17 16:29 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches I've looked at the patch and noticed a few minor issues. On 10/08/2012 12:47 PM, Sanjoy Das wrote: > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jit-reader.exp > @@ -0,0 +1,72 @@ > +# Copyright 2011-2012 Free Software Foundation, Inc. > + > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 3 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see <http://www.gnu.org/licenses/>. > + > +standard_testfile jithost.c > + > +if ![istarget x86_64-*-linux-gnu*] then { We should move aways from strict istarget checks on x86_64/i686, due to -m32 or -mx32, or even i686 with -m64. One possibility is: if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { But I'm not sure whether the test should run on x32. > + untested jit-reader.exp > + return -1; > +} > + > +if {[skip_shlib_tests]} { > + untested jit-reader.exp These should be silent. IOW, remove the untested calls. > + return -1 > +} > + > +if {[get_compiler_info]} { > + warning "Could not get compiler info" > + untested jit-reader.exp From <http://sourceware.org/gdb/wiki/GDBTestcaseCookbook>: In untested calls, please spell out the reason the test ends up untested, instead of just writing the test name, as with the latter we just end up with the test name duplicated in the gdb.sum output. For example:" > + return 1 > +} > + > +set jit_host_src ${srcfile} > +set jit_host_bin ${binfile} > + > +set include_dir ${objdir}/../../ > + > +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ > + executable [list debug incdir=${include_dir}]] != "" } { > + untested jit-reader.exp > + return -1 > +} > + > +set jit_reader jitreader > +set jit_reader_src ${jit_reader}.c > +set jit_reader_bin [standard_output_file ${jit_reader}.so] > + > +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ > + [list debug incdir=${include_dir}]] != "" } { > + untested jit-reader.exp > + return -1 > +} Add a call to gdb_load_shlibs, so the .so is uploaded to remote targets. (unless the test really only should be run on native targets.) > + > +proc jit_reader_test {} { > + global jit_host_bin > + global jit_reader_bin > + global verbose > + > + clean_restart $jit_host_bin > + > + if {$verbose > 0} { > + gdb_run_cmd "set debug jit 1" > + } > + > + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" > + gdb_run_cmd "run" > + > + gdb_test "bt" "jit_function_00.*" > +} > + > +jit_reader_test > diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c > new file mode 100644 > index 0000000..967245c > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jithost.c The test's sources miss copyright headers. > diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c > new file mode 100644 > index 0000000..2438b0d > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jitreader.c > @@ -0,0 +1,136 @@ > +#include <stdint.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > + > +#include "gdb/jit-reader.h" Is this sure to pick up the build dir's jit-reader.h, or could it trip on the system's installed copy from the system's gdb version? I notice that the test's formatting is a bit inconsistent. It's almost GNU formatting, but at places it misses the space before parens. It's not a strict requirement for tests to follow the GNU conventions, but I think consistency would be nice. Issues I noticed (several instances of each): > +struct jithost_abi { { does on next line, indented two spaces. > +enum gdb_status > +unwind_frame(struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) Missing space before parens. > +extern struct gdb_reader_funcs* gdb_init_reader(void) { { does on next line. "gdb_reader_funcs *gdb_init_reader" -- Pedro Alves ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. 2012-10-08 11:43 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das 2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das @ 2012-10-08 11:43 ` Sanjoy Das 2012-10-08 12:34 ` Eli Zaretskii 2012-10-16 20:13 ` Tom Tromey 2012-10-08 11:43 ` [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader Sanjoy Das 2 siblings, 2 replies; 24+ messages in thread From: Sanjoy Das @ 2012-10-08 11:43 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das --- gdb/ChangeLog | 5 +++++ gdb/doc/ChangeLog | 4 ++++ gdb/doc/gdb.texinfo | 22 +++++++++++++--------- gdb/jit.c | 6 +++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e57e5c1..01ee95d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> + * jit.c (jit_reader_load_command): Interpret the jit reader name + as an absolute path if it begins with a forward slash. + +2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com> + PR gdb/14550 * jit.c (finalize_symtab): Ensure that only the global block has a diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 05ac406..8cdca61 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-10-05 Sanjoy Das <sanjoy@playingwithpointers.com> + * gdb.texinfo (Using JIT Debug Info Readers): Change documentation + to reflect that jit-reader-load now supports absolute file-names. + 2012-09-26 Siddhesh Poyarekar <siddhesh@redhat.com> * observer.texi (memory_changed): Expand parameter LEN to ssize_t. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 5fcbada..c28b803 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -33436,15 +33436,19 @@ Readers can be loaded and unloaded using the @code{jit-reader-load} and @code{jit-reader-unload} commands. @table @code -@item jit-reader-load @var{reader-name} -Load the JIT reader named @var{reader-name}. On a UNIX system, this -will usually load @file{@var{libdir}/gdb/@var{reader-name}}, where -@var{libdir} is the system library directory, usually -@file{/usr/local/lib}. Only one reader can be active at a time; -trying to load a second reader when one is already loaded will result -in @value{GDBN} reporting an error. A new JIT reader can be loaded by -first unloading the current one using @code{jit-reader-load} and then -invoking @code{jit-reader-load}. +@item jit-reader-load @var{reader} +Load the JIT reader named @var{reader}. @var{reader} is a shared +object specified as either an absolute or a relative file name. In +the latter case, gdb will try to load the reader from a pre-configured +directory, usually @file{@var{libdir}/gdb/} on a UNIX system (here +@var{libdir} is the system library directory, often +@file{/usr/local/lib}). + +Only one reader can be active at a time; trying to load a second +reader when one is already loaded will result in @value{GDBN} +reporting an error. A new JIT reader can be loaded by first unloading +the current one using @code{jit-reader-unload} and then invoking +@code{jit-reader-load}. @item jit-reader-unload Unload the currently loaded JIT reader. diff --git a/gdb/jit.c b/gdb/jit.c index eff2ed6..fb6658f 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -25,6 +25,7 @@ #include "breakpoint.h" #include "command.h" #include "dictionary.h" +#include "filenames.h" #include "frame-unwind.h" #include "gdbcmd.h" #include "gdbcore.h" @@ -208,7 +209,10 @@ jit_reader_load_command (char *args, int from_tty) if (loaded_jit_reader != NULL) error (_("JIT reader already loaded. Run jit-reader-unload first.")); - so_name = xstrprintf ("%s/%s", jit_reader_dir, args); + if (IS_ABSOLUTE_PATH (args)) + so_name = xstrdup (args); + else + so_name = xstrprintf ("%s/%s", jit_reader_dir, args); prev_cleanup = make_cleanup (xfree, so_name); loaded_jit_reader = jit_reader_load (so_name); -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. 2012-10-08 11:43 ` [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects Sanjoy Das @ 2012-10-08 12:34 ` Eli Zaretskii 2012-10-16 20:13 ` Tom Tromey 1 sibling, 0 replies; 24+ messages in thread From: Eli Zaretskii @ 2012-10-08 12:34 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches > From: Sanjoy Das <sanjoy@playingwithpointers.com> > Cc: Sanjoy Das <sanjoy@playingwithpointers.com> > Date: Mon, 8 Oct 2012 17:17:28 +0530 > > +Load the JIT reader named @var{reader}. @var{reader} is a shared > +object specified as either an absolute or a relative file name. In > +the latter case, gdb will try to load the reader from a pre-configured ^^^ @value{GDB} The patch to the manual is OK with this change. Thanks. ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. 2012-10-08 11:43 ` [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects Sanjoy Das 2012-10-08 12:34 ` Eli Zaretskii @ 2012-10-16 20:13 ` Tom Tromey 1 sibling, 0 replies; 24+ messages in thread From: Tom Tromey @ 2012-10-16 20:13 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches >>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: Sanjoy> 2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> Sanjoy> + * jit.c (jit_reader_load_command): Interpret the jit reader name Sanjoy> + as an absolute path if it begins with a forward slash. This is ok, but I think it should wait until the whole series is approved. Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. 2012-10-08 11:43 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das 2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-10-08 11:43 ` [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects Sanjoy Das @ 2012-10-08 11:43 ` Sanjoy Das 2012-10-16 20:14 ` Tom Tromey 2 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-10-08 11:43 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das Issue http://sourceware.org/bugzilla/show_bug.cgi?id=14550 --- gdb/ChangeLog | 7 +++++++ gdb/jit.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8fe5e27..e57e5c1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2012-10-06 Jan Kratochvil <jan.kratochvil@redhat.com> Fix crash during stepping on ppc32. diff --git a/gdb/jit.c b/gdb/jit.c index 9e8f295..eff2ed6 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) gdb_block_iter = gdb_block_iter->next) { if (gdb_block_iter->parent != NULL) - BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = - gdb_block_iter->parent->real_block; + { + /* If the plugin specifically mentioned a parent block, we + use that. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + gdb_block_iter->parent->real_block; + } + else + { + /* And if not, we set a default parent block. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK); + } } /* Free memory. */ -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. 2012-10-08 11:43 ` [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader Sanjoy Das @ 2012-10-16 20:14 ` Tom Tromey 0 siblings, 0 replies; 24+ messages in thread From: Tom Tromey @ 2012-10-16 20:14 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches >>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: Sanjoy> +2012-10-08 Sanjoy Das <sanjoy@playingwithpointers.com> Sanjoy> + Sanjoy> + PR gdb/14550 Sanjoy> + Sanjoy> + * jit.c (finalize_symtab): Ensure that only the global block has a Sanjoy> + NULL superblock. This is ok, but I think it should wait until the whole series is approved. Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface"
@ 2012-11-04 16:59 Sanjoy Das
2012-11-04 17:00 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das
0 siblings, 1 reply; 24+ messages in thread
From: Sanjoy Das @ 2012-11-04 16:59 UTC (permalink / raw)
To: gdb-patches; +Cc: Sanjoy Das
Changes from last series:
Fix segfault when unwinding JIT frames using a custom reader.
<None>
Make jit-reader-load accept absolute paths to reader shared objects.
Fix ${GDBN} mistake pointed out by Eli
Add a test case for the jit-reader interface.
Fix issues pointed out by Pedro.
gdb/ChangeLog | 12 +++
gdb/doc/ChangeLog | 4 +
gdb/doc/gdb.texinfo | 22 +++--
gdb/jit.c | 20 ++++-
gdb/testsuite/ChangeLog | 8 ++
gdb/testsuite/gdb.base/jit-reader.exp | 73 +++++++++++++++
gdb/testsuite/gdb.base/jithost.c | 84 ++++++++++++++++++
gdb/testsuite/gdb.base/jithost.h | 27 ++++++
gdb/testsuite/gdb.base/jitreader.c | 156 +++++++++++++++++++++++++++++++++
9 files changed, 394 insertions(+), 12 deletions(-)
create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp
create mode 100644 gdb/testsuite/gdb.base/jithost.c
create mode 100644 gdb/testsuite/gdb.base/jithost.h
create mode 100644 gdb/testsuite/gdb.base/jitreader.c
--
1.7.10.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 3/3] Add a test case for the jit-reader interface. 2012-11-04 16:59 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das @ 2012-11-04 17:00 ` Sanjoy Das 2012-12-01 20:48 ` Jan Kratochvil 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-11-04 17:00 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das --- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 79 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 84 ++++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 27 ++++++ gdb/testsuite/gdb.base/jitreader.c | 156 +++++++++++++++++++++++++++++++++ 5 files changed, 354 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ad0407d..b1d61fa 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-11-04 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: Do. + * gdb.base/jithost.h: Do. + * gdb.base/jitreader.c : Do. + 2012-11-03 Yao Qi <yao@codesourcery.com> Fix PR gdb/14617. diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..4c61aeb --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,79 @@ +# Copyright 2011-2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +standard_testfile jithost.c + +if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { + return -1; +} + +if {[skip_shlib_tests]} { + return -1 +} + +if { ![isnative] } { + return -1 +} + +if {[get_compiler_info]} { + untested "could not get compiler info" + return 1 +} + +set jit_host_src ${srcfile} +set jit_host_bin ${binfile} + +# We inject the complete path to jit-reader.h into the source file +# lest we end up (incorrectly) building against a system-installed +# version. +set jit_reader_header [standard_output_file "../../../gdb/jit-reader.h"] +set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +set jit_reader jitreader +set jit_reader_src ${jit_reader}.c +set jit_reader_bin [standard_output_file ${jit_reader}.so] + +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ + [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +gdb_load_shlibs "${jit_reader_bin}" + +proc jit_reader_test {} { + global jit_host_bin + global jit_reader_bin + global verbose + + clean_restart $jit_host_bin + + if {$verbose > 0} { + gdb_run_cmd "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" + gdb_run_cmd "run" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..31adb25 --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,84 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +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; + void *symfile_addr; + uint64_t symfile_size; +}; + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +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_t) (); + +int main (int argc, char **argv) +{ + char *code = mmap (NULL, getpagesize (), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; /* SIGTRAP */ + code[1] = 0xc3; /* RET */ + + struct jithost_abi *symfile = malloc (sizeof (struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof (struct jithost_abi); + + __jit_debug_descriptor.first_entry = &only_entry; + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code (); + + function (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..52ca87a --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi +{ + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..0c935c4 --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,156 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum register_mapping +{ + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state +{ + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs *self, + struct gdb_symbol_callbacks *cbs, + void *memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object *object = cbs->object_open (cbs); + struct gdb_symtab *symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value (struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof (struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +static enum gdb_status +unwind_frame (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +static struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +static void +destroy_reader (struct gdb_reader_funcs *self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs * +gdb_init_reader (void) +{ + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-11-04 17:00 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das @ 2012-12-01 20:48 ` Jan Kratochvil 2012-12-07 9:15 ` Sanjoy Das 0 siblings, 1 reply; 24+ messages in thread From: Jan Kratochvil @ 2012-12-01 20:48 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches On Sun, 04 Nov 2012 18:03:51 +0100, Sanjoy Das wrote: > --- a/gdb/testsuite/ChangeLog > +++ b/gdb/testsuite/ChangeLog > @@ -1,3 +1,11 @@ > +2012-11-04 Sanjoy Das <sanjoy@playingwithpointers.com> > + > + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader > + interface. > + * gdb.base/jithost.c: Do. I do not understand "Do.". Either "Likewise." or also "New file.". > + * gdb.base/jithost.h: Do. > + * gdb.base/jitreader.c : Do. > + > 2012-11-03 Yao Qi <yao@codesourcery.com> > > Fix PR gdb/14617. > diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp > new file mode 100644 > index 0000000..4c61aeb > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jit-reader.exp > @@ -0,0 +1,79 @@ > +# Copyright 2011-2012 Free Software Foundation, Inc. For GDB repository it is only 2012. [...] > +proc jit_reader_test {} { > + global jit_host_bin > + global jit_reader_bin > + global verbose > + > + clean_restart $jit_host_bin > + > + if {$verbose > 0} { > + gdb_run_cmd "set debug jit 1" It executes: run {set debug jit 1} Use: gdb_test_no_output "set debug jit 1" > + } > + > + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" > + gdb_run_cmd "run" It executes: (gdb) run run Besides that it does not wait on the SIGTRAP output it produces, so it is racy. use: gdb_run_cmd gdb_test "" "Program received signal SIGTRAP, .*" "expect SIGTRAP" > + > + gdb_test "bt" "jit_function_00.*" > +} > + > +jit_reader_test > diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c > new file mode 100644 > index 0000000..31adb25 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/jithost.c > @@ -0,0 +1,84 @@ > +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. > + > + This file is part of GDB. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + > +#include <stdint.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > +#include <unistd.h> > + > +#include <sys/mman.h> > + > +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ > +#include "jithost.h" > + > +typedef enum > +{ > + JIT_NOACTION = 0, > + JIT_REGISTER_FN, > + JIT_UNREGISTER_FN > +} jit_actions_t; I do not understand why you do not use gdb/jit.h here? This file is a duplicate. Sorry if it was already discussed during initial JIT review. > + > +struct jit_code_entry > +{ > + struct jit_code_entry *next_entry; > + struct jit_code_entry *prev_entry; > + void *symfile_addr; > + uint64_t symfile_size; > +}; > + > +struct jit_descriptor > +{ > + uint32_t version; > + uint32_t action_flag; > + struct jit_code_entry *relevant_entry; > + struct jit_code_entry *first_entry; > +}; > + > +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_t) (); [...] Thanks, Jan ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-12-01 20:48 ` Jan Kratochvil @ 2012-12-07 9:15 ` Sanjoy Das 2012-12-10 16:38 ` Jan Kratochvil 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-12-07 9:15 UTC (permalink / raw) To: Jan Kratochvil; +Cc: gdb-patches [-- Attachment #1: Type: text/plain, Size: 1052 bytes --] > I do not understand "Do.". Either "Likewise." or also "New file.". Fixed. > For GDB repository it is only 2012. Fixed. > It executes: > run {set debug jit 1} > Use: > gdb_test_no_output "set debug jit 1" Fixed. > It executes: (gdb) run run > > Besides that it does not wait on the SIGTRAP output it produces, so it is > racy. use: > gdb_run_cmd > gdb_test "" "Program received signal SIGTRAP, .*" "expect SIGTRAP" Fixed. > I do not understand why you do not use gdb/jit.h here? This file is > a duplicate. Sorry if it was already discussed during initial JIT review. I don't think this has been discussed, but my justification is that we'd want the JIT tests to break if we make ABI incompatible changes to the structures in jit.h (which, loosely speaking, are part of GDB's "interface"). As an aside, something seems to have gone wrong with my SSH keys and I was wondering if someone could commit my work (patches attached) for me, if that is permissible. -- Sanjoy Das http://playingwithpointers.com [-- Attachment #2: 0001-Fix-segfault-when-unwinding-JIT-frames-using-a-custo.patch --] [-- Type: application/octet-stream, Size: 1612 bytes --] From 1cb3dd86455645c89bd51a46fda6bebd18882229 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Thu, 6 Sep 2012 04:52:28 +0530 Subject: [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. Issue http://sourceware.org/bugzilla/show_bug.cgi?id=14550 --- gdb/ChangeLog | 7 +++++++ gdb/jit.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7f9ca8f..bd74eeb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-12-07 Sanjoy Das <sanjoy@playingwithpointers.com> + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2012-12-06 Pedro Alves <palves@redhat.com> Tom Tromey <tromey@redhat.com> diff --git a/gdb/jit.c b/gdb/jit.c index 1afbee6..9817d04 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) gdb_block_iter = gdb_block_iter->next) { if (gdb_block_iter->parent != NULL) - BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = - gdb_block_iter->parent->real_block; + { + /* If the plugin specifically mentioned a parent block, we + use that. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + gdb_block_iter->parent->real_block; + } + else + { + /* And if not, we set a default parent block. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK); + } } /* Free memory. */ -- 1.7.10.4 [-- Attachment #3: 0002-Make-jit-reader-load-accept-absolute-paths-to-reader.patch --] [-- Type: application/octet-stream, Size: 3733 bytes --] From b9d68aa9b1e782c2b7393bbe10cdaf5f83a783e5 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:51:53 +0530 Subject: [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. --- gdb/ChangeLog | 5 +++++ gdb/doc/ChangeLog | 4 ++++ gdb/doc/gdb.texinfo | 22 +++++++++++++--------- gdb/jit.c | 6 +++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bd74eeb..8ecb055 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-12-07 Sanjoy Das <sanjoy@playingwithpointers.com> + * jit.c (jit_reader_load_command): Interpret the jit reader name + as an absolute path if it begins with a forward slash. + +2012-11-04 Sanjoy Das <sanjoy@playingwithpointers.com> + PR gdb/14550 * jit.c (finalize_symtab): Ensure that only the global block has a diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 1f4aa55..762a42e 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-12-07 Sanjoy Das <sanjoy@playingwithpointers.com> + * gdb.texinfo (Using JIT Debug Info Readers): Change documentation + to reflect that jit-reader-load now supports absolute file-names. + 2012-11-29 Tom Tromey <tromey@redhat.com> * gdb.texinfo (SVR4 Process Information): Document missing diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9ffdb77..b950ebd 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -33763,15 +33763,19 @@ Readers can be loaded and unloaded using the @code{jit-reader-load} and @code{jit-reader-unload} commands. @table @code -@item jit-reader-load @var{reader-name} -Load the JIT reader named @var{reader-name}. On a UNIX system, this -will usually load @file{@var{libdir}/gdb/@var{reader-name}}, where -@var{libdir} is the system library directory, usually -@file{/usr/local/lib}. Only one reader can be active at a time; -trying to load a second reader when one is already loaded will result -in @value{GDBN} reporting an error. A new JIT reader can be loaded by -first unloading the current one using @code{jit-reader-load} and then -invoking @code{jit-reader-load}. +@item jit-reader-load @var{reader} +Load the JIT reader named @var{reader}. @var{reader} is a shared +object specified as either an absolute or a relative file name. In +the latter case, @value{GDBN} will try to load the reader from a +pre-configured directory, usually @file{@var{libdir}/gdb/} on a UNIX +system (here @var{libdir} is the system library directory, often +@file{/usr/local/lib}). + +Only one reader can be active at a time; trying to load a second +reader when one is already loaded will result in @value{GDBN} +reporting an error. A new JIT reader can be loaded by first unloading +the current one using @code{jit-reader-unload} and then invoking +@code{jit-reader-load}. @item jit-reader-unload Unload the currently loaded JIT reader. diff --git a/gdb/jit.c b/gdb/jit.c index 9817d04..1e5f847 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -25,6 +25,7 @@ #include "breakpoint.h" #include "command.h" #include "dictionary.h" +#include "filenames.h" #include "frame-unwind.h" #include "gdbcmd.h" #include "gdbcore.h" @@ -208,7 +209,10 @@ jit_reader_load_command (char *args, int from_tty) if (loaded_jit_reader != NULL) error (_("JIT reader already loaded. Run jit-reader-unload first.")); - so_name = xstrprintf ("%s/%s", jit_reader_dir, args); + if (IS_ABSOLUTE_PATH (args)) + so_name = xstrdup (args); + else + so_name = xstrprintf ("%s/%s", jit_reader_dir, args); prev_cleanup = make_cleanup (xfree, so_name); loaded_jit_reader = jit_reader_load (so_name); -- 1.7.10.4 [-- Attachment #4: 0003-Add-a-test-case-for-the-jit-reader-interface.patch --] [-- Type: application/octet-stream, Size: 12186 bytes --] From 8c81255525d116d49c79eb7c76bba0deb9c1eefb Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:52:07 +0530 Subject: [PATCH 3/3] Add a test case for the jit-reader interface. --- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 80 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 84 ++++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 27 ++++++ gdb/testsuite/gdb.base/jitreader.c | 156 +++++++++++++++++++++++++++++++++ 5 files changed, 355 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 335ecff..567174f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-12-07 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: New file. + * gdb.base/jithost.h: New file. + * gdb.base/jitreader.c : New file. + 2012-12-06 Pedro Alves <palves@redhat.com> Tom Tromey <tromey@redhat.com> diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..5034c3a --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,80 @@ +# Copyright 2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +standard_testfile jithost.c + +if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { + return -1; +} + +if {[skip_shlib_tests]} { + return -1 +} + +if { ![isnative] } { + return -1 +} + +if {[get_compiler_info]} { + untested "could not get compiler info" + return 1 +} + +set jit_host_src ${srcfile} +set jit_host_bin ${binfile} + +# We inject the complete path to jit-reader.h into the source file +# lest we end up (incorrectly) building against a system-installed +# version. +set jit_reader_header [standard_output_file "../../../gdb/jit-reader.h"] +set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +set jit_reader jitreader +set jit_reader_src ${jit_reader}.c +set jit_reader_bin [standard_output_file ${jit_reader}.so] + +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ + [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +gdb_load_shlibs "${jit_reader_bin}" + +proc jit_reader_test {} { + global jit_host_bin + global jit_reader_bin + global verbose + + clean_restart $jit_host_bin + + if {$verbose > 0} { + gdb_test_no_output "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" + gdb_run_cmd + gdb_test "" "Program received signal SIGTRAP, .*" "expect SIGTRAP" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..31adb25 --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,84 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +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; + void *symfile_addr; + uint64_t symfile_size; +}; + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +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_t) (); + +int main (int argc, char **argv) +{ + char *code = mmap (NULL, getpagesize (), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; /* SIGTRAP */ + code[1] = 0xc3; /* RET */ + + struct jithost_abi *symfile = malloc (sizeof (struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof (struct jithost_abi); + + __jit_debug_descriptor.first_entry = &only_entry; + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code (); + + function (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..52ca87a --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi +{ + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..0c935c4 --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,156 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum register_mapping +{ + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state +{ + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs *self, + struct gdb_symbol_callbacks *cbs, + void *memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object *object = cbs->object_open (cbs); + struct gdb_symtab *symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value (struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof (struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +static enum gdb_status +unwind_frame (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +static struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +static void +destroy_reader (struct gdb_reader_funcs *self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs * +gdb_init_reader (void) +{ + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-12-07 9:15 ` Sanjoy Das @ 2012-12-10 16:38 ` Jan Kratochvil 2013-01-08 20:40 ` Sanjoy Das 0 siblings, 1 reply; 24+ messages in thread From: Jan Kratochvil @ 2012-12-10 16:38 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches On Fri, 07 Dec 2012 10:14:45 +0100, Sanjoy Das wrote: > > I do not understand why you do not use gdb/jit.h here? This file is > > a duplicate. Sorry if it was already discussed during initial JIT review. > > I don't think this has been discussed, but my justification is that > we'd want the JIT tests to break if we make ABI incompatible changes > to the structures in jit.h (which, loosely speaking, are part of GDB's > "interface"). OK, that makes sense. But in such case please make there a clear separate jit.h copy (with a different name and some added #ifdef/#error or something like that protection so that if one mistakenly includes gdb/jit.h it gets error-reported, with an explanation you made to me now above). > As an aside, something seems to have gone wrong with my SSH keys and I > was wondering if someone could commit my work (patches attached) for > me, if that is permissible. While I can commit it for you I find it would be better to contact <overseers at sourceware.org>. Still contact me off-list if you do want to commit it by myself (it is OK, it is commonly done). Thanks, Jan ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-12-10 16:38 ` Jan Kratochvil @ 2013-01-08 20:40 ` Sanjoy Das 2013-01-09 12:37 ` Jan Kratochvil 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2013-01-08 20:40 UTC (permalink / raw) To: Jan Kratochvil; +Cc: gdb-patches [-- Attachment #1: Type: text/plain, Size: 350 bytes --] > OK, that makes sense. But in such case please make there a clear separate > jit.h copy (with a different name and some added #ifdef/#error or something > like that protection so that if one mistakenly includes gdb/jit.h it gets > error-reported, with an explanation you made to me now above). Fixed. -- Sanjoy Das http://playingwithpointers.com [-- Attachment #2: 0001-Fix-segfault-when-unwinding-JIT-frames-using-a-custo.patch --] [-- Type: application/octet-stream, Size: 1645 bytes --] From 9620bca5b7fd2dce87ad61f781715f1caad20432 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Thu, 6 Sep 2012 04:52:28 +0530 Subject: [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. Issue http://sourceware.org/bugzilla/show_bug.cgi?id=14550 --- gdb/ChangeLog | 7 +++++++ gdb/jit.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac806e9..a796464 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-01-07 Sanjoy Das <sanjoy@playingwithpointers.com> + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2013-01-03 Pierre Muller <muller@sourceware.org> * main.c (relocate_gdb_directory): Avoid calling stat function diff --git a/gdb/jit.c b/gdb/jit.c index a930f74..f542f9e 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) gdb_block_iter = gdb_block_iter->next) { if (gdb_block_iter->parent != NULL) - BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = - gdb_block_iter->parent->real_block; + { + /* If the plugin specifically mentioned a parent block, we + use that. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + gdb_block_iter->parent->real_block; + } + else + { + /* And if not, we set a default parent block. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK); + } } /* Free memory. */ -- 1.7.10.4 [-- Attachment #3: 0002-Make-jit-reader-load-accept-absolute-paths-to-reader.patch --] [-- Type: application/octet-stream, Size: 3726 bytes --] From 8b0bf9709db7bbf06e0c65808098faebde19dd16 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:51:53 +0530 Subject: [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. --- gdb/ChangeLog | 5 +++++ gdb/doc/ChangeLog | 4 ++++ gdb/doc/gdb.texinfo | 22 +++++++++++++--------- gdb/jit.c | 6 +++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a796464..768416f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-01-07 Sanjoy Das <sanjoy@playingwithpointers.com> + * jit.c (jit_reader_load_command): Interpret the jit reader name + as an absolute path if it begins with a forward slash. + +2012-01-07 Sanjoy Das <sanjoy@playingwithpointers.com> + PR gdb/14550 * jit.c (finalize_symtab): Ensure that only the global block has a diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 801f21d..9875e0b 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-07 Sanjoy Das <sanjoy@playingwithpointers.com> + * gdb.texinfo (Using JIT Debug Info Readers): Change documentation + to reflect that jit-reader-load now supports absolute file-names. + 2013-01-02 Tom Tromey <tromey@redhat.com> * gdb.texinfo (GDB/MI Output Records): Update menu. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index dbd0c77..8b525fd 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -33965,15 +33965,19 @@ Readers can be loaded and unloaded using the @code{jit-reader-load} and @code{jit-reader-unload} commands. @table @code -@item jit-reader-load @var{reader-name} -Load the JIT reader named @var{reader-name}. On a UNIX system, this -will usually load @file{@var{libdir}/gdb/@var{reader-name}}, where -@var{libdir} is the system library directory, usually -@file{/usr/local/lib}. Only one reader can be active at a time; -trying to load a second reader when one is already loaded will result -in @value{GDBN} reporting an error. A new JIT reader can be loaded by -first unloading the current one using @code{jit-reader-load} and then -invoking @code{jit-reader-load}. +@item jit-reader-load @var{reader} +Load the JIT reader named @var{reader}. @var{reader} is a shared +object specified as either an absolute or a relative file name. In +the latter case, @value{GDBN} will try to load the reader from a +pre-configured directory, usually @file{@var{libdir}/gdb/} on a UNIX +system (here @var{libdir} is the system library directory, often +@file{/usr/local/lib}). + +Only one reader can be active at a time; trying to load a second +reader when one is already loaded will result in @value{GDBN} +reporting an error. A new JIT reader can be loaded by first unloading +the current one using @code{jit-reader-unload} and then invoking +@code{jit-reader-load}. @item jit-reader-unload Unload the currently loaded JIT reader. diff --git a/gdb/jit.c b/gdb/jit.c index f542f9e..5c63a1e 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -25,6 +25,7 @@ #include "breakpoint.h" #include "command.h" #include "dictionary.h" +#include "filenames.h" #include "frame-unwind.h" #include "gdbcmd.h" #include "gdbcore.h" @@ -208,7 +209,10 @@ jit_reader_load_command (char *args, int from_tty) if (loaded_jit_reader != NULL) error (_("JIT reader already loaded. Run jit-reader-unload first.")); - so_name = xstrprintf ("%s/%s", jit_reader_dir, args); + if (IS_ABSOLUTE_PATH (args)) + so_name = xstrdup (args); + else + so_name = xstrprintf ("%s/%s", jit_reader_dir, args); prev_cleanup = make_cleanup (xfree, so_name); loaded_jit_reader = jit_reader_load (so_name); -- 1.7.10.4 [-- Attachment #4: 0003-Add-a-test-case-for-the-jit-reader-interface.patch --] [-- Type: application/octet-stream, Size: 13634 bytes --] From 74fc6d9f1859ff1dadfabfe9dd1362bc6d2b51b7 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:52:07 +0530 Subject: [PATCH 3/3] Add a test case for the jit-reader interface. --- gdb/testsuite/ChangeLog | 9 ++ gdb/testsuite/gdb.base/jit-protocol.h | 54 ++++++++++++ gdb/testsuite/gdb.base/jit-reader.exp | 80 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 61 +++++++++++++ gdb/testsuite/gdb.base/jithost.h | 27 ++++++ gdb/testsuite/gdb.base/jitreader.c | 156 +++++++++++++++++++++++++++++++++ 6 files changed, 387 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-protocol.h create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index dde24e0..c0566b0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2012-01-07 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: New file. + * gdb.base/jithost.h: New file. + * gdb.base/jitreader.c : New file. + * gdb.base/jit-protocol.h: New file. + 2012-12-25 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.mi/mi-fullname-deleted.exp: New file. diff --git a/gdb/testsuite/gdb.base/jit-protocol.h b/gdb/testsuite/gdb.base/jit-protocol.h new file mode 100644 index 0000000..f7f9285 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-protocol.h @@ -0,0 +1,54 @@ +/* Copyright (C) 2009-2013 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifdef JIT_H +#error "We don't include jit.h directly since we'd like the jit-reader unit \ + tests to break if we make ABI incompatible changes to the structures \ + re-declared here." +#endif + +#ifndef JIT_PROTOCOL_H +#define JIT_PROTOCOL_H + +#include <stdint.h> + +typedef enum +{ + JIT_NOACTION = 0, + JIT_REGISTER, + JIT_UNREGISTER +} jit_actions_t; + + +struct jit_code_entry +{ + struct jit_code_entry *next_entry; + struct jit_code_entry *prev_entry; + void *symfile_addr; + uint64_t symfile_size; +}; + + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +#endif /* JIT_PROTOCOL_H */ diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..5034c3a --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,80 @@ +# Copyright 2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +standard_testfile jithost.c + +if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { + return -1; +} + +if {[skip_shlib_tests]} { + return -1 +} + +if { ![isnative] } { + return -1 +} + +if {[get_compiler_info]} { + untested "could not get compiler info" + return 1 +} + +set jit_host_src ${srcfile} +set jit_host_bin ${binfile} + +# We inject the complete path to jit-reader.h into the source file +# lest we end up (incorrectly) building against a system-installed +# version. +set jit_reader_header [standard_output_file "../../../gdb/jit-reader.h"] +set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +set jit_reader jitreader +set jit_reader_src ${jit_reader}.c +set jit_reader_bin [standard_output_file ${jit_reader}.so] + +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ + [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +gdb_load_shlibs "${jit_reader_bin}" + +proc jit_reader_test {} { + global jit_host_bin + global jit_reader_bin + global verbose + + clean_restart $jit_host_bin + + if {$verbose > 0} { + gdb_test_no_output "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" + gdb_run_cmd + gdb_test "" "Program received signal SIGTRAP, .*" "expect SIGTRAP" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..413c4cd --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,61 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.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_t) (); + +int main (int argc, char **argv) +{ + char *code = mmap (NULL, getpagesize (), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; /* SIGTRAP */ + code[1] = 0xc3; /* RET */ + + struct jithost_abi *symfile = malloc (sizeof (struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof (struct jithost_abi); + + __jit_debug_descriptor.first_entry = &only_entry; + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code (); + + function (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..52ca87a --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi +{ + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..0c935c4 --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,156 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum register_mapping +{ + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state +{ + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs *self, + struct gdb_symbol_callbacks *cbs, + void *memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object *object = cbs->object_open (cbs); + struct gdb_symtab *symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value (struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof (struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +static enum gdb_status +unwind_frame (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +static struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +static void +destroy_reader (struct gdb_reader_funcs *self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs * +gdb_init_reader (void) +{ + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2013-01-08 20:40 ` Sanjoy Das @ 2013-01-09 12:37 ` Jan Kratochvil 2013-01-13 21:58 ` Sanjoy Das 0 siblings, 1 reply; 24+ messages in thread From: Jan Kratochvil @ 2013-01-09 12:37 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches On Tue, 08 Jan 2013 21:40:02 +0100, Sanjoy Das wrote: > > OK, that makes sense. But in such case please make there a clear separate > > jit.h copy (with a different name and some added #ifdef/#error or something > > like that protection so that if one mistakenly includes gdb/jit.h it gets > > error-reported, with an explanation you made to me now above). > > Fixed. > +#ifdef JIT_H > +#error "We don't include jit.h directly since we'd like the jit-reader unit \ > + tests to break if we make ABI incompatible changes to the structures \ > + re-declared here." > +#endif OK, thanks for the explanation, it looks clear to me now. > + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" Do not use full binary path in test name, those differ across testsuite runs. That is use for example: gdb_test_no_output "jit-reader-load ${jit_reader_bin}" "jit-reader-load" Therefore these three parts are OK for check-in. There was a never-replied mail but that suggestion is not required for this check-in. Re: [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. http://sourceware.org/ml/gdb-patches/2012-12/msg00007.html Message-ID: <20121201202522.GA22812@host2.jankratochvil.net> Thanks, Jan ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2013-01-09 12:37 ` Jan Kratochvil @ 2013-01-13 21:58 ` Sanjoy Das 2013-01-14 3:52 ` Jan Kratochvil 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2013-01-13 21:58 UTC (permalink / raw) To: Jan Kratochvil; +Cc: gdb-patches [-- Attachment #1: Type: text/plain, Size: 415 bytes --] Hi, Changes from the last series: > Do not use full binary path in test name, those differ across testsuite runs. > That is use for example: > gdb_test_no_output "jit-reader-load ${jit_reader_bin}" "jit-reader-load" 1. Fixed above issue. 2. Use SLASH_STRING instead of a raw backslash when computing the full path of a plugin (in the second patch). Thanks! -- Sanjoy Das http://playingwithpointers.com [-- Attachment #2: 0001-Fix-segfault-when-unwinding-JIT-frames-using-a-custo.patch --] [-- Type: application/octet-stream, Size: 1653 bytes --] From 03cf27011fa85a21112cf21ac0765ce472b561af Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Thu, 6 Sep 2012 04:52:28 +0530 Subject: [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader. Issue http://sourceware.org/bugzilla/show_bug.cgi?id=14550 --- gdb/ChangeLog | 7 +++++++ gdb/jit.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d9a2e45..b619953 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-01-14 Sanjoy Das <sanjoy@playingwithpointers.com> + + PR gdb/14550 + + * jit.c (finalize_symtab): Ensure that only the global block has a + NULL superblock. + 2013-01-13 Jan Kratochvil <jan.kratochvil@redhat.com> * parse.c (parse_exp_in_context): New variable inner_chain. Call diff --git a/gdb/jit.c b/gdb/jit.c index a930f74..f542f9e 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -724,8 +724,18 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) gdb_block_iter = gdb_block_iter->next) { if (gdb_block_iter->parent != NULL) - BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = - gdb_block_iter->parent->real_block; + { + /* If the plugin specifically mentioned a parent block, we + use that. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + gdb_block_iter->parent->real_block; + } + else + { + /* And if not, we set a default parent block. */ + BLOCK_SUPERBLOCK (gdb_block_iter->real_block) = + BLOCKVECTOR_BLOCK (symtab->blockvector, STATIC_BLOCK); + } } /* Free memory. */ -- 1.7.10.4 [-- Attachment #3: 0002-Make-jit-reader-load-accept-absolute-paths-to-reader.patch --] [-- Type: application/octet-stream, Size: 3741 bytes --] From 90b964a0742ab876f8b8648e4fff5e8393b22f08 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:51:53 +0530 Subject: [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects. --- gdb/ChangeLog | 5 +++++ gdb/doc/ChangeLog | 4 ++++ gdb/doc/gdb.texinfo | 22 +++++++++++++--------- gdb/jit.c | 6 +++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b619953..c6f94b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-01-14 Sanjoy Das <sanjoy@playingwithpointers.com> + * jit.c (jit_reader_load_command): Interpret the jit reader name + as an absolute path if it begins with a forward slash. + +2012-01-14 Sanjoy Das <sanjoy@playingwithpointers.com> + PR gdb/14550 * jit.c (finalize_symtab): Ensure that only the global block has a diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 0eb574d..6594ea0 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-14 Sanjoy Das <sanjoy@playingwithpointers.com> + * gdb.texinfo (Using JIT Debug Info Readers): Change documentation + to reflect that jit-reader-load now supports absolute file-names. + 2013-01-07 Tom Tromey <tromey@redhat.com> * gdb.texinfo (Mode Options): Don't mention -epoch. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index f973263..4731d59 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -33940,15 +33940,19 @@ Readers can be loaded and unloaded using the @code{jit-reader-load} and @code{jit-reader-unload} commands. @table @code -@item jit-reader-load @var{reader-name} -Load the JIT reader named @var{reader-name}. On a UNIX system, this -will usually load @file{@var{libdir}/gdb/@var{reader-name}}, where -@var{libdir} is the system library directory, usually -@file{/usr/local/lib}. Only one reader can be active at a time; -trying to load a second reader when one is already loaded will result -in @value{GDBN} reporting an error. A new JIT reader can be loaded by -first unloading the current one using @code{jit-reader-load} and then -invoking @code{jit-reader-load}. +@item jit-reader-load @var{reader} +Load the JIT reader named @var{reader}. @var{reader} is a shared +object specified as either an absolute or a relative file name. In +the latter case, @value{GDBN} will try to load the reader from a +pre-configured directory, usually @file{@var{libdir}/gdb/} on a UNIX +system (here @var{libdir} is the system library directory, often +@file{/usr/local/lib}). + +Only one reader can be active at a time; trying to load a second +reader when one is already loaded will result in @value{GDBN} +reporting an error. A new JIT reader can be loaded by first unloading +the current one using @code{jit-reader-unload} and then invoking +@code{jit-reader-load}. @item jit-reader-unload Unload the currently loaded JIT reader. diff --git a/gdb/jit.c b/gdb/jit.c index f542f9e..4623f15 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -25,6 +25,7 @@ #include "breakpoint.h" #include "command.h" #include "dictionary.h" +#include "filenames.h" #include "frame-unwind.h" #include "gdbcmd.h" #include "gdbcore.h" @@ -208,7 +209,10 @@ jit_reader_load_command (char *args, int from_tty) if (loaded_jit_reader != NULL) error (_("JIT reader already loaded. Run jit-reader-unload first.")); - so_name = xstrprintf ("%s/%s", jit_reader_dir, args); + if (IS_ABSOLUTE_PATH (args)) + so_name = xstrdup (args); + else + so_name = xstrprintf ("%s%s%s", SLASH_STRING, jit_reader_dir, args); prev_cleanup = make_cleanup (xfree, so_name); loaded_jit_reader = jit_reader_load (so_name); -- 1.7.10.4 [-- Attachment #4: 0003-Add-a-test-case-for-the-jit-reader-interface.patch --] [-- Type: application/octet-stream, Size: 13642 bytes --] From 1336918c7e94059cab51ffad4d56fba50e3fe6d4 Mon Sep 17 00:00:00 2001 From: Sanjoy Das <sanjoy@playingwithpointers.com> Date: Tue, 18 Sep 2012 08:52:07 +0530 Subject: [PATCH 3/3] Add a test case for the jit-reader interface. --- gdb/testsuite/ChangeLog | 9 ++ gdb/testsuite/gdb.base/jit-protocol.h | 54 ++++++++++++ gdb/testsuite/gdb.base/jit-reader.exp | 80 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 61 +++++++++++++ gdb/testsuite/gdb.base/jithost.h | 27 ++++++ gdb/testsuite/gdb.base/jitreader.c | 156 +++++++++++++++++++++++++++++++++ 6 files changed, 387 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-protocol.h create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 717ea18..0fdd82c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2012-01-14 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: New file. + * gdb.base/jithost.h: New file. + * gdb.base/jitreader.c : New file. + * gdb.base/jit-protocol.h: New file. + 2013-01-13 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.cp/parse-lang.cc: New file. diff --git a/gdb/testsuite/gdb.base/jit-protocol.h b/gdb/testsuite/gdb.base/jit-protocol.h new file mode 100644 index 0000000..f7f9285 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-protocol.h @@ -0,0 +1,54 @@ +/* Copyright (C) 2009-2013 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifdef JIT_H +#error "We don't include jit.h directly since we'd like the jit-reader unit \ + tests to break if we make ABI incompatible changes to the structures \ + re-declared here." +#endif + +#ifndef JIT_PROTOCOL_H +#define JIT_PROTOCOL_H + +#include <stdint.h> + +typedef enum +{ + JIT_NOACTION = 0, + JIT_REGISTER, + JIT_UNREGISTER +} jit_actions_t; + + +struct jit_code_entry +{ + struct jit_code_entry *next_entry; + struct jit_code_entry *prev_entry; + void *symfile_addr; + uint64_t symfile_size; +}; + + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +#endif /* JIT_PROTOCOL_H */ diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..6080564 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,80 @@ +# Copyright 2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +standard_testfile jithost.c + +if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) || ![is_lp64_target] } { + return -1; +} + +if {[skip_shlib_tests]} { + return -1 +} + +if { ![isnative] } { + return -1 +} + +if {[get_compiler_info]} { + untested "could not get compiler info" + return 1 +} + +set jit_host_src ${srcfile} +set jit_host_bin ${binfile} + +# We inject the complete path to jit-reader.h into the source file +# lest we end up (incorrectly) building against a system-installed +# version. +set jit_reader_header [standard_output_file "../../../gdb/jit-reader.h"] +set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +set jit_reader jitreader +set jit_reader_src ${jit_reader}.c +set jit_reader_bin [standard_output_file ${jit_reader}.so] + +if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ + [list debug additional_flags=$jit_reader_flag]] != "" } { + untested jit-reader.exp + return -1 +} + +gdb_load_shlibs "${jit_reader_bin}" + +proc jit_reader_test {} { + global jit_host_bin + global jit_reader_bin + global verbose + + clean_restart $jit_host_bin + + if {$verbose > 0} { + gdb_test_no_output "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${jit_reader_bin}" "jit-reader-load" + gdb_run_cmd + gdb_test "" "Program received signal SIGTRAP, .*" "expect SIGTRAP" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..413c4cd --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,61 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.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_t) (); + +int main (int argc, char **argv) +{ + char *code = mmap (NULL, getpagesize (), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; /* SIGTRAP */ + code[1] = 0xc3; /* RET */ + + struct jithost_abi *symfile = malloc (sizeof (struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof (struct jithost_abi); + + __jit_debug_descriptor.first_entry = &only_entry; + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code (); + + function (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..52ca87a --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,27 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi +{ + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..0c935c4 --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,156 @@ +/* Copyright (C) 2009-2012 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include JIT_READER_H /* Please see jit-reader.exp for an explanation. */ +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum register_mapping +{ + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state +{ + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs *self, + struct gdb_symbol_callbacks *cbs, + void *memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object *object = cbs->object_open (cbs); + struct gdb_symtab *symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value (struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof (struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +static enum gdb_status +unwind_frame (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +static struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs *self, struct gdb_unwind_callbacks *cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +static void +destroy_reader (struct gdb_reader_funcs *self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs * +gdb_init_reader (void) +{ + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2013-01-13 21:58 ` Sanjoy Das @ 2013-01-14 3:52 ` Jan Kratochvil 0 siblings, 0 replies; 24+ messages in thread From: Jan Kratochvil @ 2013-01-14 3:52 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches On Sun, 13 Jan 2013 22:57:34 +0100, Sanjoy Das wrote: > 2. Use SLASH_STRING instead of a raw backslash when computing the full > path of a plugin (in the second patch). I have considered it pre-approved for a commit with the few changes. But I see you can improve: + so_name = xstrprintf ("%s%s%s", SLASH_STRING, jit_reader_dir, args); -> + so_name = xstrprintf ("%s" SLASH_STRING "%s", jit_reader_dir, args); So the patchset is approved again with this change. Thanks, Jan ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" @ 2012-09-24 4:48 Sanjoy Das 2012-09-24 4:48 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-09-24 4:48 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das Changes from last series: Fix http://sourceware.org/bugzilla/show_bug.cgi?id=14550 * Fix comment grammar. Make jit-reader-load accept absolute paths to reader shared objects. * Use IS_ABSOLUTE_PATH instead of ad-hoc check. * Don't use "path" to mean "file name". * Fix nit with jit-reader-load / jit-reader-unload. Add a test case for the jit-reader interface. * Remove bad copy-paste. * Use gdb_run_cmd instead of gdb_test foo ".*" gdb/ChangeLog | 12 +++ gdb/doc/ChangeLog | 4 + gdb/doc/gdb.texinfo | 22 +++--- gdb/jit.c | 20 ++++- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 71 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 67 ++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 9 +++ gdb/testsuite/gdb.base/jitreader.c | 136 +++++++++++++++++++++++++++++++++ 9 files changed, 337 insertions(+), 12 deletions(-) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 3/3] Add a test case for the jit-reader interface. 2012-09-24 4:48 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das @ 2012-09-24 4:48 ` Sanjoy Das 2012-09-27 21:00 ` Tom Tromey 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-09-24 4:48 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das --- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 71 +++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 67 ++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 9 +++ gdb/testsuite/gdb.base/jitreader.c | 136 +++++++++++++++++++++++++++++++++ 5 files changed, 291 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index dfb6b41..1fa2fd4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-09-24 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp: New file. Test case for the jit-reader + interface. + * gdb.base/jithost.c: Do. + * gdb.base/jithost.h: Do. + * gdb.base/jitreader.c : Do. + 2012-09-21 Jan Kratochvil <jan.kratochvil@redhat.com> Fix internal error on canonicalization of clang types. diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..7d22c34 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,71 @@ +# Copyright 2011-2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if ![istarget x86_64-*-linux-gnu*] then { + untested jit-reader.exp + return -1; +} + +if {[skip_shlib_tests]} { + untested jit-reader.exp + return -1 +} + +if {[get_compiler_info]} { + warning "Could not get compiler info" + untested jit-reader.exp + return 1 +} + +set jit_host jithost +set jit_host_src ${jit_host}.c +set jit_host_bin ${objdir}/${subdir}/${jit_host} + +set include_dir ${objdir}/../../ + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +set reader "jitreader" +set reader_srcfile "${srcdir}/${subdir}/${reader}.c" +set reader_binfile "${objdir}/${subdir}/${reader}.so" + +if { [gdb_compile_shlib ${reader_srcfile} ${reader_binfile} \ + [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +proc jit_reader_test {} { + global jit_host + global reader_binfile + global verbose + + clean_restart $jit_host + + if {$verbose > 0} { + gdb_run_cmd "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${reader_binfile}" + gdb_run_cmd "run" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..967245c --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,67 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +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; + void *symfile_addr; + uint64_t symfile_size; +}; + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +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_t)(); + +int main(int argc, char **argv) +{ + char *code = mmap(NULL, getpagesize(), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; // Generate a SIGTRAP + code[1] = 0xc3; // RET + + struct jithost_abi *symfile = malloc(sizeof(struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof(struct jithost_abi); + + __jit_debug_descriptor.first_entry = + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code(); + + function(); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..37cf042 --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,9 @@ +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi { + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..2438b0d --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,136 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum RegisterMapping { + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state { + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs* self, + struct gdb_symbol_callbacks* cbs, + void* memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object* object = cbs->object_open (cbs); + struct gdb_symtab* symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value(struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof(struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +enum gdb_status +unwind_frame(struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + printf("Unwinding %p\n", (void *) this_ip); + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +void +destroy_reader(struct gdb_reader_funcs* self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs* gdb_init_reader(void) { + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-09-24 4:48 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das @ 2012-09-27 21:00 ` Tom Tromey 0 siblings, 0 replies; 24+ messages in thread From: Tom Tromey @ 2012-09-27 21:00 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches >>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: Sanjoy> +set jit_host jithost Sanjoy> +set jit_host_src ${jit_host}.c Sanjoy> +set jit_host_bin ${objdir}/${subdir}/${jit_host} I'd prefer it if this used standard_testfile and particularly standard_output_file rather than $objdir. Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 0/3] Fix recent breakage in the JIT reader interface @ 2012-09-18 4:30 Sanjoy Das 2012-09-18 4:30 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-09-18 4:30 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das These three patches fix an issue with the JIT reader interface and adds a regression test for the same. Sanjoy Das (3): Fix http://sourceware.org/bugzilla/show_bug.cgi?id=14550 Make jit-reader-load accept absolute paths to reader shared objects. Add a test case for the jit-reader interface. gdb/ChangeLog | 12 +++ gdb/doc/ChangeLog | 4 + gdb/doc/gdb.texinfo | 22 +++--- gdb/jit.c | 19 ++++- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 78 +++++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 67 ++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 9 +++ gdb/testsuite/gdb.base/jitreader.c | 136 +++++++++++++++++++++++++++++++++ 9 files changed, 343 insertions(+), 12 deletions(-) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 3/3] Add a test case for the jit-reader interface. 2012-09-18 4:30 [PATCH 0/3] Fix recent breakage in the JIT reader interface Sanjoy Das @ 2012-09-18 4:30 ` Sanjoy Das 2012-09-18 19:36 ` Tom Tromey 0 siblings, 1 reply; 24+ messages in thread From: Sanjoy Das @ 2012-09-18 4:30 UTC (permalink / raw) To: gdb-patches; +Cc: Sanjoy Das --- gdb/testsuite/ChangeLog | 8 ++ gdb/testsuite/gdb.base/jit-reader.exp | 78 +++++++++++++++++++ gdb/testsuite/gdb.base/jithost.c | 67 ++++++++++++++++ gdb/testsuite/gdb.base/jithost.h | 9 +++ gdb/testsuite/gdb.base/jitreader.c | 136 +++++++++++++++++++++++++++++++++ 5 files changed, 298 insertions(+) create mode 100644 gdb/testsuite/gdb.base/jit-reader.exp create mode 100644 gdb/testsuite/gdb.base/jithost.c create mode 100644 gdb/testsuite/gdb.base/jithost.h create mode 100644 gdb/testsuite/gdb.base/jitreader.c diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b458aba..f770475 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com> + + * gdb.base/jit-reader.exp (new): Test case for the jit-reader + interface. + * gdb.base/jithost.c (new): Do. + * gdb.base/jithost.h (new): Do. + * gdb.base/jitreader.c (new) : Do. + 2012-09-17 Yao Qi <yao@codesourcery.com> * gdb.base/list.exp (set_listsize): Don't set arg to "unlimited" diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp new file mode 100644 index 0000000..9a85b76 --- /dev/null +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -0,0 +1,78 @@ +# Copyright 2011-2012 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if ![istarget x86_64-*-linux-gnu*] then { + untested jit-reader.exp + return -1; +} + +if {[skip_shlib_tests]} { + untested jit-reader.exp + return -1 +} + +if {[get_compiler_info]} { + warning "Could not get compiler info" + untested jit-reader.exp + return 1 +} + +# +# test running programs +# + +set jit_host jithost +set jit_host_src ${jit_host}.c +set jit_host_bin ${objdir}/${subdir}/${jit_host} + +set include_dir ${objdir}/../../ + +if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ + executable [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +set reader "jitreader" +set reader_srcfile "${srcdir}/${subdir}/${reader}.c" +set reader_binfile "${objdir}/${subdir}/${reader}.so" + +# Note: compiling without debug info: the library goes through symbol +# renaming by munging on its symbol table, and that wouldn't work for .debug +# sections. Also, output for "info function" changes when debug info is resent. +if { [gdb_compile_shlib ${reader_srcfile} ${reader_binfile} \ + [list debug incdir=${include_dir}]] != "" } { + untested jit-reader.exp + return -1 +} + +proc jit_reader_test {} { + global jit_host + global reader_binfile + global verbose + + clean_restart $jit_host + + if {$verbose > 0} { + gdb_test "set debug jit 1" + } + + gdb_test_no_output "jit-reader-load ${reader_binfile}" + gdb_test "run" ".*" + + gdb_test "bt" "jit_function_00.*" +} + +jit_reader_test diff --git a/gdb/testsuite/gdb.base/jithost.c b/gdb/testsuite/gdb.base/jithost.c new file mode 100644 index 0000000..967245c --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.c @@ -0,0 +1,67 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/mman.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +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; + void *symfile_addr; + uint64_t symfile_size; +}; + +struct jit_descriptor +{ + uint32_t version; + uint32_t action_flag; + struct jit_code_entry *relevant_entry; + struct jit_code_entry *first_entry; +}; + +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_t)(); + +int main(int argc, char **argv) +{ + char *code = mmap(NULL, getpagesize(), PROT_WRITE | PROT_EXEC, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + jit_function_t *function = (jit_function_t *) code; + + code[0] = 0xcc; // Generate a SIGTRAP + code[1] = 0xc3; // RET + + struct jithost_abi *symfile = malloc(sizeof(struct jithost_abi)); + symfile->begin = code; + symfile->end = code + 2; + + only_entry.symfile_addr = symfile; + only_entry.symfile_size = sizeof(struct jithost_abi); + + __jit_debug_descriptor.first_entry = + __jit_debug_descriptor.relevant_entry = &only_entry; + __jit_debug_descriptor.action_flag = JIT_REGISTER_FN; + __jit_debug_descriptor.version = 1; + __jit_debug_register_code(); + + function(); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/jithost.h b/gdb/testsuite/gdb.base/jithost.h new file mode 100644 index 0000000..37cf042 --- /dev/null +++ b/gdb/testsuite/gdb.base/jithost.h @@ -0,0 +1,9 @@ +#ifndef JITHOST_H +#define JITHOST_H + +struct jithost_abi { + const char *begin; + const char *end; +}; + +#endif /* JITHOST_H */ diff --git a/gdb/testsuite/gdb.base/jitreader.c b/gdb/testsuite/gdb.base/jitreader.c new file mode 100644 index 0000000..2438b0d --- /dev/null +++ b/gdb/testsuite/gdb.base/jitreader.c @@ -0,0 +1,136 @@ +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "gdb/jit-reader.h" +#include "jithost.h" + +GDB_DECLARE_GPL_COMPATIBLE_READER; + +enum RegisterMapping { + AMD64_RA = 16, + AMD64_RSP = 7, +}; + +struct reader_state { + uintptr_t code_begin; + uintptr_t code_end; +}; + +static enum gdb_status +read_debug_info (struct gdb_reader_funcs* self, + struct gdb_symbol_callbacks* cbs, + void* memory, long memory_sz) +{ + struct jithost_abi *symfile = memory; + struct gdb_object* object = cbs->object_open (cbs); + struct gdb_symtab* symtab = cbs->symtab_open (cbs, object, ""); + GDB_CORE_ADDR begin = (GDB_CORE_ADDR) symfile->begin; + GDB_CORE_ADDR end = (GDB_CORE_ADDR) symfile->end; + + cbs->block_open (cbs, symtab, NULL, begin, end, "jit_function_00"); + + cbs->symtab_close (cbs, symtab); + cbs->object_close (cbs, object); + return GDB_SUCCESS; +} + +static void +free_reg_value(struct gdb_reg_value *value) +{ + free (value); +} + +static void +write_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, + uintptr_t value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = + malloc (sizeof(struct gdb_reg_value) + size - 1); + reg_val->defined = 1; + reg_val->free = free_reg_value; + + memcpy (reg_val->value, &value, size); + callbacks->reg_set (callbacks, dw_reg, reg_val); +} + +static int +read_register (struct gdb_unwind_callbacks *callbacks, int dw_reg, uintptr_t *value) +{ + const int size = sizeof (uintptr_t); + struct gdb_reg_value *reg_val = callbacks->reg_get (callbacks, dw_reg); + if (reg_val->size != size || !reg_val->defined) + { + reg_val->free (reg_val); + return 0; + } + memcpy (value, reg_val->value, size); + reg_val->free (reg_val); + return 1; +} + +enum gdb_status +unwind_frame(struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + const int word_size = sizeof (uintptr_t); + uintptr_t this_sp, this_ip, prev_ip, prev_sp; + struct reader_state *state = (struct reader_state *) self->priv_data; + + if (!read_register (cbs, AMD64_RA, &this_ip)) + return GDB_FAIL; + + if (this_ip >= state->code_end || this_ip < state->code_begin) + return GDB_FAIL; + + printf("Unwinding %p\n", (void *) this_ip); + + if (!read_register (cbs, AMD64_RSP, &this_sp)) + return GDB_FAIL; + + if (cbs->target_read (this_sp, &prev_ip, word_size) == GDB_FAIL) + return GDB_FAIL; + + prev_sp = this_sp + word_size; + write_register (cbs, AMD64_RA, prev_ip); + write_register (cbs, AMD64_RSP, prev_sp); + return GDB_SUCCESS; +} + +struct gdb_frame_id +get_frame_id (struct gdb_reader_funcs* self, struct gdb_unwind_callbacks* cbs) +{ + struct reader_state *state = (struct reader_state *) self->priv_data; + struct gdb_frame_id frame_id; + + uintptr_t sp; + read_register (cbs, AMD64_RSP, &sp); + + frame_id.code_address = (GDB_CORE_ADDR) state->code_begin; + frame_id.stack_address = (GDB_CORE_ADDR) sp; + + return frame_id; +} + +void +destroy_reader(struct gdb_reader_funcs* self) +{ + free (self->priv_data); + free (self); +} + +extern struct gdb_reader_funcs* gdb_init_reader(void) { + struct reader_state *state = malloc (sizeof (struct reader_state)); + struct gdb_reader_funcs *reader_funcs = + malloc (sizeof (struct gdb_reader_funcs)); + + reader_funcs->reader_version = GDB_READER_INTERFACE_VERSION; + reader_funcs->priv_data = state; + reader_funcs->read = read_debug_info; + reader_funcs->unwind = unwind_frame; + reader_funcs->get_frame_id = get_frame_id; + reader_funcs->destroy = destroy_reader; + + return reader_funcs; +} -- 1.7.10.4 ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 3/3] Add a test case for the jit-reader interface. 2012-09-18 4:30 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das @ 2012-09-18 19:36 ` Tom Tromey 0 siblings, 0 replies; 24+ messages in thread From: Tom Tromey @ 2012-09-18 19:36 UTC (permalink / raw) To: Sanjoy Das; +Cc: gdb-patches >>>>> "Sanjoy" == Sanjoy Das <sanjoy@playingwithpointers.com> writes: Sanjoy> +2012-09-18 Sanjoy Das <sanjoy@playingwithpointers.com> Thanks. This is very nice. Sanjoy> + * gdb.base/jit-reader.exp (new): Test case for the jit-reader Sanjoy> + interface. Sanjoy> + * gdb.base/jithost.c (new): Do. Sanjoy> + * gdb.base/jithost.h (new): Do. Sanjoy> + * gdb.base/jitreader.c (new) : Do. Those should be like: * gdb.base/jithost.c: New file. Sanjoy> +# Note: compiling without debug info: the library goes through symbol Sanjoy> +# renaming by munging on its symbol table, and that wouldn't work for .debug Sanjoy> +# sections. Also, output for "info function" changes when debug info is resent. Bad copy&paste :) I think this comment isn't relevant & can be deleted. Sanjoy> + gdb_test "run" ".*" Use gdb_run_cmd instead. Tom ^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2013-01-14 3:52 UTC | newest] Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-10-08 11:43 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das 2012-10-08 11:43 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-10-16 20:16 ` Tom Tromey 2012-10-17 16:16 ` Pedro Alves 2012-10-17 16:27 ` Tom Tromey 2012-10-17 16:35 ` Pedro Alves 2012-10-17 16:29 ` Pedro Alves 2012-10-08 11:43 ` [PATCH 2/3] Make jit-reader-load accept absolute paths to reader shared objects Sanjoy Das 2012-10-08 12:34 ` Eli Zaretskii 2012-10-16 20:13 ` Tom Tromey 2012-10-08 11:43 ` [PATCH 1/3] Fix segfault when unwinding JIT frames using a custom reader Sanjoy Das 2012-10-16 20:14 ` Tom Tromey -- strict thread matches above, loose matches on Subject: below -- 2012-11-04 16:59 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das 2012-11-04 17:00 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-12-01 20:48 ` Jan Kratochvil 2012-12-07 9:15 ` Sanjoy Das 2012-12-10 16:38 ` Jan Kratochvil 2013-01-08 20:40 ` Sanjoy Das 2013-01-09 12:37 ` Jan Kratochvil 2013-01-13 21:58 ` Sanjoy Das 2013-01-14 3:52 ` Jan Kratochvil 2012-09-24 4:48 [PATCH 0/3] Address review, "fix recent breakage in the JIT reader interface" Sanjoy Das 2012-09-24 4:48 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-09-27 21:00 ` Tom Tromey 2012-09-18 4:30 [PATCH 0/3] Fix recent breakage in the JIT reader interface Sanjoy Das 2012-09-18 4:30 ` [PATCH 3/3] Add a test case for the jit-reader interface Sanjoy Das 2012-09-18 19:36 ` Tom Tromey
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox