[2/4] compile: Add new field scope_data
Commit Message
Provide a way to associate more data with enum compile_i_scope_types up to the
struct do_module_cleanup stage.
It should be all sub-classed but AFAIK GDB does not require C++ compiler yet.
gdb/ChangeLog
2015-03-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* cli/cli-script.c (execute_control_command): Update
eval_compile_command caller.
* compile/compile-object-load.h (struct compile_module): Add field
scope_data.
* compile/compile-object-run.c (struct do_module_cleanup): Add field
scope_data.
(compile_object_run): Propage the field scope_data.
* compile/compile.c (compile_file_command, compile_code_command):
Update eval_compile_command callers.
(eval_compile_command): Add parameter scope_data. Set it.
* compile/compile.h (eval_compile_command): Add parameter scope_data.
* defs.h (struct command_line): Add field scope_data.
---
gdb/cli/cli-script.c | 3 ++-
gdb/compile/compile-object-load.h | 3 +++
gdb/compile/compile-object-run.c | 4 ++++
gdb/compile/compile.c | 7 ++++---
gdb/compile/compile.h | 3 ++-
gdb/defs.h | 1 +
6 files changed, 16 insertions(+), 5 deletions(-)
Comments
obsoleted:
[PATCH v2 2/9] compile: Distribute scope, add scope_data
https://sourceware.org/ml/gdb-patches/2015-04/msg00157.html
@@ -615,7 +615,8 @@ execute_control_command (struct command_line *cmd)
}
case compile_control:
- eval_compile_command (cmd, NULL, cmd->control_u.compile.scope);
+ eval_compile_command (cmd, NULL, cmd->control_u.compile.scope,
+ cmd->control_u.compile.scope_data);
ret = simple_control;
break;
@@ -31,6 +31,9 @@ struct compile_module
/* Inferior registers address or NULL if the inferior function does not
require any. */
CORE_ADDR regs_addr;
+
+ /* User data for enum compile_i_scope_types in use. */
+ void *scope_data;
};
extern struct compile_module *compile_object_load (const char *object_file,
@@ -36,6 +36,9 @@ struct do_module_cleanup
/* .c file OBJFILE was built from. It needs to be xfree-d. */
char *source_file;
+ /* User data for enum compile_i_scope_types in use. */
+ void *scope_data;
+
/* objfile_name of our objfile. */
char objfile_name_string[1];
};
@@ -96,6 +99,7 @@ compile_object_run (struct compile_module *module)
data->executedp = &executed;
data->source_file = xstrdup (module->source_file);
strcpy (data->objfile_name_string, objfile_name_s);
+ data->scope_data = module->scope_data;
xfree (module->source_file);
xfree (module);
@@ -117,7 +117,7 @@ compile_file_command (char *arg, int from_tty)
make_cleanup (xfree, arg);
buffer = xstrprintf ("#include \"%s\"\n", arg);
make_cleanup (xfree, buffer);
- eval_compile_command (NULL, buffer, scope);
+ eval_compile_command (NULL, buffer, scope, NULL);
do_cleanups (cleanup);
}
@@ -150,7 +150,7 @@ compile_code_command (char *arg, int from_tty)
}
if (arg && *arg)
- eval_compile_command (NULL, arg, scope);
+ eval_compile_command (NULL, arg, scope, NULL);
else
{
struct command_line *l = get_command_line (compile_control, "");
@@ -555,7 +555,7 @@ compile_command (char *args, int from_tty)
void
eval_compile_command (struct command_line *cmd, char *cmd_string,
- enum compile_i_scope_types scope)
+ enum compile_i_scope_types scope, void *scope_data)
{
char *object_file, *source_file;
@@ -572,6 +572,7 @@ eval_compile_command (struct command_line *cmd, char *cmd_string,
compile_module = compile_object_load (object_file, source_file);
discard_cleanups (cleanup_unlink);
do_cleanups (cleanup_xfree);
+ compile_module->scope_data = scope_data;
compile_object_run (compile_module);
}
}
@@ -29,7 +29,8 @@ struct dynamic_prop;
never both. */
extern void eval_compile_command (struct command_line *cmd, char *cmd_string,
- enum compile_i_scope_types scope);
+ enum compile_i_scope_types scope,
+ void *scope_data);
/* Compile a DWARF location expression to C, suitable for use by the
compiler.
@@ -400,6 +400,7 @@ struct command_line
struct
{
enum compile_i_scope_types scope;
+ void *scope_data;
}
compile;
}