diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-06-03 21:22:56 +0200 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-06-03 21:26:04 +0200 |
commit | 7f36105668d57c26b52037202f5d97dbad91336b (patch) | |
tree | 2407b3a87ac36d7cdf19708fbec9669b55810203 /gdb/compile/compile-object-run.c | |
parent | f277626b45b9d4af76e5d61a7efe09ce417ac200 (diff) | |
download | gdb-7f36105668d57c26b52037202f5d97dbad91336b.zip gdb-7f36105668d57c26b52037202f5d97dbad91336b.tar.gz gdb-7f36105668d57c26b52037202f5d97dbad91336b.tar.bz2 |
compile: Use also inferior munmap
Currently inferior memory is allocated by inferior mmap() but it is never
deallocated; despite the injected objfile incl. its symbols is freed. This was
intentional so that one can do for example:
inferior:
char *str = "foo";
GDB:
(gdb) compile code str = "bar";
I believe later patches will be needed to introduce full control over keeping
vs. discarding the injected module as being discussed in:
compile: objfiles lifetime UI
https://sourceware.org/ml/gdb/2015-04/msg00051.html
Message-ID: <20150429135735.GA16974@host1.jankratochvil.net>
https://sourceware.org/ml/gdb/2015-05/msg00007.html
As decided by Phil it is better not to leak inferior pages as users can
workaround the issue above for example by:
(gdb) compile code str = strdup ("bar");
I have checked that in fact gdb/doc/ (written by Phil) already expects the
injected code will be unmapped so that does not need to be changed:
compile code int ff = 5; p = &ff;
In this example, @code{p} would point to @code{ff} when the
@code{compile} command is executing the source code provided to it.
However, as variables in the (example) program persist with their
assigned values, the variable @code{p} would point to an invalid
location when the command exists.
gdb/ChangeLog
2015-04-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* arch-utils.c (default_infcall_munmap): New.
* arch-utils.h (default_infcall_munmap): New declaration.
* compile/compile-object-load.c (struct munmap_list, munmap_list_add)
(munmap_list_free, munmap_listp_free_cleanup): New.
(struct setup_sections_data): Add field munmap_list_headp.
(setup_sections): Call munmap_list_add.
(compile_object_load): New variable munmap_list_head, initialize
setup_sections_data.munmap_list_headp, return munmap_list_head.
* compile/compile-object-load.h (struct munmap_list): New declaration.
(struct compile_module): Add field munmap_list_head.
(munmap_list_free): New declaration.
* compile/compile-object-run.c (struct do_module_cleanup): Add field
munmap_list_head.
(do_module_cleanup): Call munmap_list_free.
(compile_object_run): Pass munmap_list_head to do_module_cleanup.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* gdbarch.sh (infcall_munmap): New.
* linux-tdep.c (linux_infcall_munmap): New.
(linux_init_abi): Install it.
gdb/testsuite/ChangeLog
2015-04-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.compile/compile.exp (keep jit in memory): Rename to ...
(do not keep jit in memory): ... this.
(expect 5): Change it to ...
(expect no 5): ... this.
Diffstat (limited to 'gdb/compile/compile-object-run.c')
-rw-r--r-- | gdb/compile/compile-object-run.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c index 771a209..ce47831 100644 --- a/gdb/compile/compile-object-run.c +++ b/gdb/compile/compile-object-run.c @@ -47,6 +47,9 @@ struct do_module_cleanup struct type *out_value_type; CORE_ADDR out_value_addr; + /* Copy from struct compile_module. */ + struct munmap_list *munmap_list_head; + /* objfile_name of our objfile. */ char objfile_name_string[1]; }; @@ -96,6 +99,8 @@ do_module_cleanup (void *arg, int registers_valid) unlink (data->source_file); xfree (data->source_file); + munmap_list_free (data->munmap_list_head); + /* Delete the .o file. */ unlink (data->objfile_name_string); xfree (data); @@ -128,6 +133,7 @@ compile_object_run (struct compile_module *module) data->scope_data = module->scope_data; data->out_value_type = module->out_value_type; data->out_value_addr = module->out_value_addr; + data->munmap_list_head = module->munmap_list_head; xfree (module->source_file); xfree (module); |