From patchwork Mon Apr 6 17:26:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 6018 Received: (qmail 12626 invoked by alias); 6 Apr 2015 17:26:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 12616 invoked by uid 89); 6 Apr 2015 17:26:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 06 Apr 2015 17:26:43 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id AC097BBF49 for ; Mon, 6 Apr 2015 17:26:42 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t36HQeb5017180; Mon, 6 Apr 2015 13:26:41 -0400 Subject: [PATCH v2 2/9] compile: Distribute scope, add scope_data From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Phil Muldoon Date: Mon, 06 Apr 2015 19:26:40 +0200 Message-ID: <20150406172640.31404.18825.stgit@host1.jankratochvil.net> In-Reply-To: <20150406172623.31404.58833.stgit@host1.jankratochvil.net> References: <20150406172623.31404.58833.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes Provide a way to access current 'scope' during struct the do_module_cleanup stage and associate more data with it. It should be all sub-classed but AFAIK GDB does not require C++ compiler yet. gdb/ChangeLog 2015-04-06 Jan Kratochvil * cli/cli-script.c (execute_control_command): Update eval_compile_command caller. * compile/compile-object-load.c (compile_object_load): Add parameters scope and scope_data. Set them. * compile/compile-object-load.h (struct compile_module): Add fields scope and scope_data. (compile_object_load): Add parameters scope and scope_data. * compile/compile-object-run.c (struct do_module_cleanup): Add fields scope and scope_data. (compile_object_run): Propage the fields scope and scope_data. * compile/compile.c (compile_file_command, compile_code_command): Update eval_compile_command callers. (eval_compile_command): Add parameter scope_data. Pass it plus scope. * 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.c | 5 ++++- gdb/compile/compile-object-load.h | 10 +++++++++- gdb/compile/compile-object-run.c | 6 ++++++ gdb/compile/compile.c | 9 +++++---- gdb/compile/compile.h | 3 ++- gdb/defs.h | 1 + 7 files changed, 29 insertions(+), 8 deletions(-) diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 7a4ed78..4bd18a7 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -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; diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c index 8a7f232..70b2e2e 100644 --- a/gdb/compile/compile-object-load.c +++ b/gdb/compile/compile-object-load.c @@ -464,7 +464,8 @@ store_regs (struct type *regs_type, CORE_ADDR regs_base) function returns. */ struct compile_module * -compile_object_load (const char *object_file, const char *source_file) +compile_object_load (const char *object_file, const char *source_file, + enum compile_i_scope_types scope, void *scope_data) { struct cleanup *cleanups, *cleanups_free_objfile; bfd *abfd; @@ -587,5 +588,7 @@ compile_object_load (const char *object_file, const char *source_file) retval->source_file = xstrdup (source_file); retval->func_addr = func_addr; retval->regs_addr = regs_addr; + retval->scope = scope; + retval->scope_data = scope_data; return retval; } diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h index bef575e..4f9493b 100644 --- a/gdb/compile/compile-object-load.h +++ b/gdb/compile/compile-object-load.h @@ -31,9 +31,17 @@ struct compile_module /* Inferior registers address or NULL if the inferior function does not require any. */ CORE_ADDR regs_addr; + + /* The "scope" of this compilation. */ + enum compile_i_scope_types scope; + + /* User data for SCOPE in use. */ + void *scope_data; }; extern struct compile_module *compile_object_load (const char *object_file, - const char *source_file); + const char *source_file, + enum compile_i_scope_types scope, + void *scope_data); #endif /* GDB_COMPILE_OBJECT_LOAD_H */ diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c index 6738aad..bfd2473 100644 --- a/gdb/compile/compile-object-run.c +++ b/gdb/compile/compile-object-run.c @@ -36,6 +36,10 @@ struct do_module_cleanup /* .c file OBJFILE was built from. It needs to be xfree-d. */ char *source_file; + /* Copy from struct compile_module. */ + enum compile_i_scope_types scope; + void *scope_data; + /* objfile_name of our objfile. */ char objfile_name_string[1]; }; @@ -96,6 +100,8 @@ 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 = module->scope; + data->scope_data = module->scope_data; xfree (module->source_file); xfree (module); diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 90cfc36..3cbbc29 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -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, ""); @@ -557,7 +557,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; @@ -571,7 +571,8 @@ eval_compile_command (struct command_line *cmd, char *cmd_string, make_cleanup (xfree, source_file); cleanup_unlink = make_cleanup (cleanup_unlink_file, object_file); make_cleanup (cleanup_unlink_file, source_file); - compile_module = compile_object_load (object_file, source_file); + compile_module = compile_object_load (object_file, source_file, + scope, scope_data); discard_cleanups (cleanup_unlink); do_cleanups (cleanup_xfree); compile_object_run (compile_module); diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h index 1e3f934..93c4786 100644 --- a/gdb/compile/compile.h +++ b/gdb/compile/compile.h @@ -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. diff --git a/gdb/defs.h b/gdb/defs.h index 72512f6..6476f80 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -400,6 +400,7 @@ struct command_line struct { enum compile_i_scope_types scope; + void *scope_data; } compile; }