From patchwork Wed Oct 19 01:12:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 16642 Received: (qmail 124949 invoked by alias); 19 Oct 2016 01:12:43 -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 124904 invoked by uid 89); 19 Oct 2016 01:12:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 spammy=dc, d.c, sk:discard, INPUT 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 ESMTP; Wed, 19 Oct 2016 01:12:40 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5528F85540 for ; Wed, 19 Oct 2016 01:12:39 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9J1CJjq019701 for ; Tue, 18 Oct 2016 21:12:38 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v2 21/31] Use ui_file_as_string in gdb/compile/ Date: Wed, 19 Oct 2016 02:12:09 +0100 Message-Id: <1476839539-8374-22-git-send-email-palves@redhat.com> In-Reply-To: <1476839539-8374-1-git-send-email-palves@redhat.com> References: <1476839539-8374-1-git-send-email-palves@redhat.com> gdb/ChangeLog: yyyy-mm-yy Pedro Alves * c-lang.h (c_compute_program): Now returns std::string. * compile/compile-c-support.c (c_compute_program): Now returns a std::string. Use ui_file_as_string. * compile/compile.c (get_new_file_names): Change output parameters to std::string pointers. Use string_printf. (compile_to_object): Change output parameters to std::string pointers. Use ui_file_as_string. (eval_compile_command): Use std::string. * language.h (struct language_defn) : Now returns std::string. --- gdb/c-lang.h | 7 +++-- gdb/compile/compile-c-support.c | 6 ++-- gdb/compile/compile.c | 70 +++++++++++++++++++---------------------- gdb/language.h | 14 ++++----- 4 files changed, 46 insertions(+), 51 deletions(-) diff --git a/gdb/c-lang.h b/gdb/c-lang.h index 12be8bf..fa49791 100644 --- a/gdb/c-lang.h +++ b/gdb/c-lang.h @@ -152,13 +152,14 @@ extern int c_textual_element_type (struct type *, char); extern struct compile_instance *c_get_compile_context (void); -/* This takes the user-supplied text and returns a newly malloc'd bit - of code to compile. +/* This takes the user-supplied text and returns a new bit of code to + compile. This is used as the la_compute_program language method; see that for a description of the arguments. */ -extern char *c_compute_program (struct compile_instance *inst, +extern std::string + c_compute_program (struct compile_instance *inst, const char *input, struct gdbarch *gdbarch, const struct block *expr_block, diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c index c42daba..641b0fd 100644 --- a/gdb/compile/compile-c-support.c +++ b/gdb/compile/compile-c-support.c @@ -326,7 +326,7 @@ generate_register_struct (struct ui_file *stream, struct gdbarch *gdbarch, to the inferior when the expression was created, and EXPR_PC indicates the value of $PC. */ -char * +std::string c_compute_program (struct compile_instance *inst, const char *input, struct gdbarch *gdbarch, @@ -334,7 +334,7 @@ c_compute_program (struct compile_instance *inst, CORE_ADDR expr_pc) { struct ui_file *buf, *var_stream = NULL; - char *code; + std::string code; struct cleanup *cleanup; struct compile_c_instance *context = (struct compile_c_instance *) inst; @@ -435,7 +435,7 @@ c_compute_program (struct compile_instance *inst, fputs_unfiltered ("}\n", buf); add_code_footer (inst->scope, buf); - code = ui_file_xstrdup (buf, NULL); + code = ui_file_as_string (buf); do_cleanups (cleanup); return code; } diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 0c4a738..0db95e4 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -259,14 +259,14 @@ get_compile_file_tempdir (void) allocated by malloc and should be freed by the caller. */ static void -get_new_file_names (char **source_file, char **object_file) +get_new_file_names (std::string *source_file, std::string *object_file) { static int seq; const char *dir = get_compile_file_tempdir (); ++seq; - *source_file = xstrprintf ("%s%sout%d.c", dir, SLASH_STRING, seq); - *object_file = xstrprintf ("%s%sout%d.o", dir, SLASH_STRING, seq); + *source_file = string_printf ("%s%sout%d.c", dir, SLASH_STRING, seq); + *object_file = string_printf ("%s%sout%d.o", dir, SLASH_STRING, seq); } /* Get the block and PC at which to evaluate an expression. */ @@ -460,14 +460,13 @@ print_callback (void *ignore, const char *message) error condition, error () is called. The caller is responsible for freeing both strings. */ -static char * +static void compile_to_object (struct command_line *cmd, const char *cmd_string, enum compile_i_scope_types scope, - char **source_filep) + std::string *source_filep, + std::string *object_filep) { - char *code; const char *input; - char *source_file, *object_file; struct compile_instance *compiler; struct cleanup *cleanup, *inner_cleanup; const struct block *expr_block; @@ -503,11 +502,13 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, /* From the provided expression, build a scope to pass to the compiler. */ + + std::string input_buf; + if (cmd != NULL) { struct ui_file *stream = mem_fileopen (); struct command_line *iter; - char *stream_buf; make_cleanup_ui_file_delete (stream); for (iter = cmd->body_list[0]; iter; iter = iter->next) @@ -516,20 +517,19 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, fputs_unfiltered ("\n", stream); } - stream_buf = ui_file_xstrdup (stream, NULL); - make_cleanup (xfree, stream_buf); - input = stream_buf; + input_buf = ui_file_as_string (stream); + input = input_buf.c_str (); } else if (cmd_string != NULL) input = cmd_string; else error (_("Neither a simple expression, or a multi-line specified.")); - code = current_language->la_compute_program (compiler, input, gdbarch, - expr_block, expr_pc); - make_cleanup (xfree, code); + std::string code + = current_language->la_compute_program (compiler, input, gdbarch, + expr_block, expr_pc); if (compile_debug) - fprintf_unfiltered (gdb_stdlog, "debug output:\n\n%s", code); + fprintf_unfiltered (gdb_stdlog, "debug output:\n\n%s", code.c_str ()); os_rx = osabi_triplet_regexp (gdbarch_osabi (gdbarch)); arch_rx = gdbarch_gnu_triplet_regexp (gdbarch); @@ -560,37 +560,34 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, argi, argv[argi]); } - get_new_file_names (&source_file, &object_file); - inner_cleanup = make_cleanup (xfree, source_file); - make_cleanup (xfree, object_file); + get_new_file_names (source_filep, object_filep); - src = gdb_fopen_cloexec (source_file, "w"); + src = gdb_fopen_cloexec (source_filep->c_str (), "w"); if (src == NULL) perror_with_name (_("Could not open source file for writing")); - make_cleanup (cleanup_unlink_file, source_file); - if (fputs (code, src) == EOF) + inner_cleanup = make_cleanup (cleanup_unlink_file, + (void *) source_filep->c_str ()); + if (fputs (code.c_str (), src) == EOF) perror_with_name (_("Could not write to source file")); fclose (src); if (compile_debug) fprintf_unfiltered (gdb_stdlog, "source file produced: %s\n\n", - source_file); + source_filep->c_str ()); /* Call the compiler and start the compilation process. */ - compiler->fe->ops->set_source_file (compiler->fe, source_file); + compiler->fe->ops->set_source_file (compiler->fe, source_filep->c_str ()); - if (!compiler->fe->ops->compile (compiler->fe, object_file, + if (!compiler->fe->ops->compile (compiler->fe, object_filep->c_str (), compile_debug)) error (_("Compilation failed.")); if (compile_debug) fprintf_unfiltered (gdb_stdlog, "object file produced: %s\n\n", - object_file); + object_filep->c_str ()); discard_cleanups (inner_cleanup); do_cleanups (cleanup); - *source_filep = source_file; - return object_file; } /* The "compile" prefix command. */ @@ -609,30 +606,27 @@ void eval_compile_command (struct command_line *cmd, const char *cmd_string, enum compile_i_scope_types scope, void *scope_data) { - char *object_file, *source_file; + std::string source_file, object_file; - object_file = compile_to_object (cmd, cmd_string, scope, &source_file); - if (object_file != NULL) + compile_to_object (cmd, cmd_string, scope, &source_file, &object_file); + if (!object_file.empty ()) { - struct cleanup *cleanup_xfree, *cleanup_unlink; + struct cleanup *cleanup_unlink; struct compile_module *compile_module; - cleanup_xfree = make_cleanup (xfree, object_file); - 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, + cleanup_unlink = make_cleanup (cleanup_unlink_file, + (void *) object_file.c_str ()); + make_cleanup (cleanup_unlink_file, (void *) source_file.c_str ()); + compile_module = compile_object_load (object_file.c_str (), source_file.c_str (), scope, scope_data); if (compile_module == NULL) { gdb_assert (scope == COMPILE_I_PRINT_ADDRESS_SCOPE); - do_cleanups (cleanup_xfree); eval_compile_command (cmd, cmd_string, COMPILE_I_PRINT_VALUE_SCOPE, scope_data); return; } discard_cleanups (cleanup_unlink); - do_cleanups (cleanup_xfree); compile_object_run (compile_module); } } diff --git a/gdb/language.h b/gdb/language.h index d6f932e..758f265 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -406,8 +406,8 @@ struct language_defn If 'la_get_gcc_context' is not defined, then this method is ignored. - This takes the user-supplied text and returns a newly malloc'd - bit of code to compile. The caller owns the result. + This takes the user-supplied text and returns a new bit of code + to compile. INST is the compiler instance being used. INPUT is the user's input text. @@ -416,11 +416,11 @@ struct language_defn parsed. EXPR_PC is the PC at which the expression is being parsed. */ - char *(*la_compute_program) (struct compile_instance *inst, - const char *input, - struct gdbarch *gdbarch, - const struct block *expr_block, - CORE_ADDR expr_pc); + std::string (*la_compute_program) (struct compile_instance *inst, + const char *input, + struct gdbarch *gdbarch, + const struct block *expr_block, + CORE_ADDR expr_pc); /* Add fields above this point, so the magic number is always last. */ /* Magic number for compat checking. */