It is planned the existing GDB command 'print' will be able to evaluate its expressions using the compiler. There will be some option to choose between the existing GDB evaluation and the compiler evaluation. But as an intermediate step this patch provides the expression printing feature as a new command. I can imagine it could be also called 'maintenance compile print' as in the future one should be able to use its functionality by the normal 'print' command. There was a discussion with Eli about the command name: https://sourceware.org/ml/gdb-patches/2015-03/msg00880.html As there were no other comments yet I haven't renamed it yet, before there is some confirmation about settlement on the final name. Support for the GDB '@' operator to create arrays has been submitted for GCC: [gcc patch] libcc1: '@' GDB array operator https://gcc.gnu.org/ml/gcc-patches/2015-03/msg01451.html gdb/ChangeLog 2015-05-16 Jan Kratochvil <jan.kratochvil@redhat.com> Phil Muldoon <pmuldoon@redhat.com> * NEWS (Changes since GDB 7.9): Add compile print. * compile/compile-c-support.c (add_code_header, add_code_footer) (c_compute_program): Add COMPILE_I_PRINT_ADDRESS_SCOPE and COMPILE_I_PRINT_VALUE_SCOPE. * compile/compile-internal.h (COMPILE_I_PRINT_OUT_ARG_TYPE) (COMPILE_I_PRINT_OUT_ARG, COMPILE_I_EXPR_VAL, COMPILE_I_EXPR_PTR_TYPE): New. * compile/compile-object-load.c: Include block.h. (get_out_value_type): New function. (compile_object_load): Handle COMPILE_I_PRINT_ADDRESS_SCOPE and COMPILE_I_PRINT_VALUE_SCOPE. Set compile_module's OUT_VALUE_ADDR and OUT_VALUE_TYPE. * compile/compile-object-load.h (struct compile_module): Add fields out_value_addr and out_value_type. * compile/compile-object-run.c: Include valprint.h and compile.h. (struct do_module_cleanup): Add fields out_value_addr and out_value_type. (do_module_cleanup): Handle COMPILE_I_PRINT_ADDRESS_SCOPE and COMPILE_I_PRINT_VALUE_SCOPE. (compile_object_run): Propagate out_value_addr and out_value_type. Pass OUT_VALUE_ADDR. * compile/compile.c: Include valprint.h. (compile_print_value, compile_print_command): New functions. (eval_compile_command): Handle failed COMPILE_I_PRINT_ADDRESS_SCOPE. (_initialize_compile): Update compile code help text. Install compile_print_command. * compile/compile.h (compile_print_value): New prototype. * defs.h (enum compile_i_scope_types): Add COMPILE_I_PRINT_ADDRESS_SCOPE and COMPILE_I_PRINT_VALUE_SCOPE. gdb/doc/ChangeLog 2015-05-16 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.texinfo (Compiling and Injecting Code): Add compile print. gdb/testsuite/ChangeLog 2015-05-16 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.compile/compile-print.c: New file. * gdb.compile/compile-print.exp: New file.
188 lines
5.7 KiB
C
188 lines
5.7 KiB
C
/* Call module for 'compile' command.
|
|
|
|
Copyright (C) 2014-2015 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 "defs.h"
|
|
#include "compile-object-run.h"
|
|
#include "value.h"
|
|
#include "infcall.h"
|
|
#include "objfiles.h"
|
|
#include "compile-internal.h"
|
|
#include "dummy-frame.h"
|
|
#include "block.h"
|
|
#include "valprint.h"
|
|
#include "compile.h"
|
|
|
|
/* Helper for do_module_cleanup. */
|
|
|
|
struct do_module_cleanup
|
|
{
|
|
/* Boolean to set true upon a call of do_module_cleanup.
|
|
The pointer may be NULL. */
|
|
int *executedp;
|
|
|
|
/* .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;
|
|
|
|
/* Copy from struct compile_module. */
|
|
struct type *out_value_type;
|
|
CORE_ADDR out_value_addr;
|
|
|
|
/* objfile_name of our objfile. */
|
|
char objfile_name_string[1];
|
|
};
|
|
|
|
/* Cleanup everything after the inferior function dummy frame gets
|
|
discarded. */
|
|
|
|
static dummy_frame_dtor_ftype do_module_cleanup;
|
|
static void
|
|
do_module_cleanup (void *arg, int registers_valid)
|
|
{
|
|
struct do_module_cleanup *data = arg;
|
|
struct objfile *objfile;
|
|
|
|
if (data->executedp != NULL)
|
|
{
|
|
*data->executedp = 1;
|
|
|
|
/* This code cannot be in compile_object_run as OUT_VALUE_TYPE
|
|
no longer exists there. */
|
|
if (data->scope == COMPILE_I_PRINT_ADDRESS_SCOPE
|
|
|| data->scope == COMPILE_I_PRINT_VALUE_SCOPE)
|
|
{
|
|
struct value *addr_value;
|
|
struct type *ptr_type = lookup_pointer_type (data->out_value_type);
|
|
|
|
addr_value = value_from_pointer (ptr_type, data->out_value_addr);
|
|
|
|
/* SCOPE_DATA would be stale unlesse EXECUTEDP != NULL. */
|
|
compile_print_value (value_ind (addr_value), data->scope_data);
|
|
}
|
|
}
|
|
|
|
ALL_OBJFILES (objfile)
|
|
if ((objfile->flags & OBJF_USERLOADED) == 0
|
|
&& (strcmp (objfile_name (objfile), data->objfile_name_string) == 0))
|
|
{
|
|
free_objfile (objfile);
|
|
|
|
/* It may be a bit too pervasive in this dummy_frame dtor callback. */
|
|
clear_symtab_users (0);
|
|
|
|
break;
|
|
}
|
|
|
|
/* Delete the .c file. */
|
|
unlink (data->source_file);
|
|
xfree (data->source_file);
|
|
|
|
/* Delete the .o file. */
|
|
unlink (data->objfile_name_string);
|
|
xfree (data);
|
|
}
|
|
|
|
/* Perform inferior call of MODULE. This function may throw an error.
|
|
This function may leave files referenced by MODULE on disk until
|
|
the inferior call dummy frame is discarded. This function may throw errors.
|
|
Thrown errors and left MODULE files are unrelated events. Caller must no
|
|
longer touch MODULE's memory after this function has been called. */
|
|
|
|
void
|
|
compile_object_run (struct compile_module *module)
|
|
{
|
|
struct value *func_val;
|
|
struct frame_id dummy_id;
|
|
struct cleanup *cleanups;
|
|
struct do_module_cleanup *data;
|
|
const char *objfile_name_s = objfile_name (module->objfile);
|
|
int dtor_found, executed = 0;
|
|
struct symbol *func_sym = module->func_sym;
|
|
CORE_ADDR regs_addr = module->regs_addr;
|
|
struct objfile *objfile = module->objfile;
|
|
|
|
data = xmalloc (sizeof (*data) + strlen (objfile_name_s));
|
|
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;
|
|
data->out_value_type = module->out_value_type;
|
|
data->out_value_addr = module->out_value_addr;
|
|
|
|
xfree (module->source_file);
|
|
xfree (module);
|
|
module = NULL;
|
|
|
|
TRY
|
|
{
|
|
struct type *func_type = SYMBOL_TYPE (func_sym);
|
|
htab_t copied_types;
|
|
int current_arg = 0;
|
|
struct value **vargs;
|
|
|
|
/* OBJFILE may disappear while FUNC_TYPE still will be in use. */
|
|
copied_types = create_copied_types_hash (objfile);
|
|
func_type = copy_type_recursive (objfile, func_type, copied_types);
|
|
htab_delete (copied_types);
|
|
|
|
gdb_assert (TYPE_CODE (func_type) == TYPE_CODE_FUNC);
|
|
func_val = value_from_pointer (lookup_pointer_type (func_type),
|
|
BLOCK_START (SYMBOL_BLOCK_VALUE (func_sym)));
|
|
|
|
vargs = alloca (sizeof (*vargs) * TYPE_NFIELDS (func_type));
|
|
if (TYPE_NFIELDS (func_type) >= 1)
|
|
{
|
|
gdb_assert (regs_addr != 0);
|
|
vargs[current_arg] = value_from_pointer
|
|
(TYPE_FIELD_TYPE (func_type, current_arg), regs_addr);
|
|
++current_arg;
|
|
}
|
|
if (TYPE_NFIELDS (func_type) >= 2)
|
|
{
|
|
gdb_assert (data->out_value_addr != 0);
|
|
vargs[current_arg] = value_from_pointer
|
|
(TYPE_FIELD_TYPE (func_type, current_arg), data->out_value_addr);
|
|
++current_arg;
|
|
}
|
|
gdb_assert (current_arg == TYPE_NFIELDS (func_type));
|
|
call_function_by_hand_dummy (func_val, TYPE_NFIELDS (func_type), vargs,
|
|
do_module_cleanup, data);
|
|
}
|
|
CATCH (ex, RETURN_MASK_ERROR)
|
|
{
|
|
/* In the case of DTOR_FOUND or in the case of EXECUTED nothing
|
|
needs to be done. */
|
|
dtor_found = find_dummy_frame_dtor (do_module_cleanup, data);
|
|
if (!executed)
|
|
data->executedp = NULL;
|
|
gdb_assert (!(dtor_found && executed));
|
|
if (!dtor_found && !executed)
|
|
do_module_cleanup (data, 0);
|
|
throw_exception (ex);
|
|
}
|
|
END_CATCH
|
|
|
|
dtor_found = find_dummy_frame_dtor (do_module_cleanup, data);
|
|
gdb_assert (!dtor_found && executed);
|
|
}
|