2000-02-23 01:25:43 +01:00
|
|
|
/* MI Command Set.
|
2004-02-14 18:26:35 +01:00
|
|
|
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software
|
|
|
|
Foundation, Inc.
|
2004-02-14 18:26:35 +01:00
|
|
|
|
2000-02-23 07:19:22 +01:00
|
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
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 2 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, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
/* Work in progress */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "target.h"
|
|
|
|
#include "inferior.h"
|
|
|
|
#include "gdb_string.h"
|
2005-01-12 Andrew Cagney <cagney@gnu.org>
* exceptions.h (enum return_reason, RETURN_MASK)
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL)
(return_mask, throw_exception, catch_exceptions_ftype)
(catch_exceptions_with_msg, catch_errors_ftype, catch_errors)
(catch_command_errors_ftype, catch_command_errors): Move to
exceptions.h.
* exceptions.c, exceptions.h: New files.
* top.c: Do not include <setjmp.h>.
(SIGJMP_BUF, SIGSETJMP, SIGLONGJMP, catch_return)
(throw_exception, catcher, catch_exceptions)
(catch_exceptions_with_msg, struct catch_errors_args)
(do_catch_errors, catch_errors, struct captured_command_args)
(do_captured_command, catch_command_errors): Move to exceptions.c.
* wrapper.c, wince.c, win32-nat.c, utils.c: Include "exceptions.h".
* tui/tui-interp.c, top.c, thread.c, symmisc.c: Ditto.
* symfile-mem.c, stack.c, solib.c, rs6000-nat.c: Ditto.
* remote-sds.c, remote-mips.c, remote-fileio.c: Ditto.
* remote-e7000.c, objc-lang.c, ocd.c: Ditto.
* remote.c, nto-procfs.c, monitor.c, mi/mi-main.c: Ditto.
* main.c, m32r-rom.c, infrun.c, inf-loop.c: Ditto.
* hppa-hpux-tdep.c, frame.c, event-top.c, event-loop.c: Ditto.
* corelow.c, corefile.c, cli/cli-interp.c, breakpoint.c: Ditto.
* ada-valprint.c, ada-lang.c: Ditto.
* Makefile.in (HFILES_NO_SRCDIR, COMMON_OBS): Add exceptions.h and
exceptions.o. Update all dependencies.
2005-01-12 19:31:35 +01:00
|
|
|
#include "exceptions.h"
|
2000-02-23 01:25:43 +01:00
|
|
|
#include "top.h"
|
|
|
|
#include "gdbthread.h"
|
|
|
|
#include "mi-cmds.h"
|
|
|
|
#include "mi-parse.h"
|
|
|
|
#include "mi-getopt.h"
|
|
|
|
#include "mi-console.h"
|
|
|
|
#include "ui-out.h"
|
|
|
|
#include "mi-out.h"
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
#include "interps.h"
|
2000-02-23 01:25:43 +01:00
|
|
|
#include "event-loop.h"
|
|
|
|
#include "event-top.h"
|
|
|
|
#include "gdbcore.h" /* for write_memory() */
|
2002-11-13 Andrew Cagney <cagney@redhat.com>
* regcache.h (deprecated_read_register_bytes): Rename
read_register_bytes.
(deprecated_write_register_bytes): Rename write_register_bytes.
* alpha-tdep.c, arm-tdep.c, cris-tdep.c, d10v-tdep.c: Update.
* dwarf2cfi.c, frv-tdep.c, hppa-tdep.c, ia64-tdep.c: Update.
* m68k-tdep.c, mcore-tdep.c, mips-tdep.c, mn10300-tdep.c: Update.
* ns32k-tdep.c, regcache.c, remote-sds.c, remote-vx.c: Update.
* remote.c, rs6000-tdep.c, s390-tdep.c, sh-tdep.c: Update.
* sparc-tdep.c, v850-tdep.c, vax-tdep.c, x86-64-tdep.c: Update.
* xstormy16-tdep.c, z8k-tdep.c, config/nm-gnu.h: Update.
* config/nm-m3.h, config/h8500/tm-h8500.h: Update.
* config/i386/nm-ptx4.h, config/i386/nm-symmetry.h: Update.
* config/m32r/tm-m32r.h, config/m68k/nm-sun3.h: Update.
* config/m68k/tm-delta68.h, config/m68k/tm-linux.h: Update.
* config/mn10200/tm-mn10200.h, config/pa/tm-hppa64.h: Update.
* config/sparc/nm-nbsd.h, config/sparc/nm-sun4os4.h: Update.
* config/sparc/nm-sun4sol2.h, config/sparc/tm-sparclet.h: Update.
2002-11-13 Andrew Cagney <ac131313@redhat.com>
* mi-main.c (mi_cmd_data_write_register_values): Use
deprecated_write_register_bytes instead of write_register_bytes.
2002-11-14 01:25:05 +01:00
|
|
|
#include "value.h" /* for deprecated_write_register_bytes() */
|
2001-03-01 02:39:22 +01:00
|
|
|
#include "regcache.h"
|
2001-07-28 21:48:15 +02:00
|
|
|
#include "gdb.h"
|
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* inferior.h (registers_info, stepi_command, nexti_command,
continue_command, interrupt_target_command): Export from infcmd.c.
* frame.h (args_info, selected_frame_level_changed_hook,
return_command): Export from stack.c.
* v850ice.c (stepi_command, nexti_command, continue_command): use
prototypes from inferior.h.
* tracepoint.c (registers_info, args_info, locals_info): Use
prototypes from frame.h and inferior.h.
* Makefile.in (mi-main.o): Add dependency on frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Don't use
return_command_wrapper, use return_command instead.
(mi_cmd_exec_interrupt): Don't use
interrupt_target_command_wrapper, use interrupt_target_command
instead.
(return_command_wrapper, interrupt_target_command_wrapper):
Delete.
Include frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* tui-hooks.c (selected_frame_level_changed_hook): Use the one
exported from frame.h.
2002-10-02 23:33:59 +02:00
|
|
|
#include "frame.h"
|
2003-06-08 Andrew Cagney <cagney@redhat.com>
* acinclude.m4 (gcc_AC_CHECK_DECL, (gcc_AC_CHECK_DECL): Stolen
from GCC's acinclude.m4.
* configure.in: Check for getopt's delcaration.
* aclocal.m4, config.in, configure: Re-generate.
* main.c (error_init): Delete declaration.
* defs.h (error_init): Declare.
* rs6000-tdep.c (rs6000_fetch_pointer_argument): Make static.
(rs6000_convert_from_func_ptr_addr): Make static.
(_initialize_rs6000_tdep): Add declaration.
* cli/cli-cmds.c (dont_repeat): Delete declaration.
(show_commands, set_verbose, show_history): Delete declaration.
* top.h (set_verbose): Add declaration.
(show_history, set_history, show_commands): Add declaration.
(do_restore_instream_cleanup): Add declaration.
* objc-lang.c (specialcmp): Make static.
(print_object_command): Make static.
(find_objc_msgsend): Make static.
(find_objc_msgcall_submethod_helper): Make static.
(find_objc_msgcall_submethod): Make static.
(_initialize_objc_language): Add declaration.
(find_implementation_from_class): Make static.
(find_implementation): Make static.
* objc-exp.y (yylex): Delete lookup_struct_typedef declaration.
* objc-lang.h (lookup_struct_typedef): Add declaration.
* cli/cli-interp.c (_initialize_cli_interp): Add declaration.
* cli/cli-script.c (clear_hook_in_cleanup): Make static.
(do_restore_user_call_depth): Make static.
(do_restore_instream_cleanup): Delete declaration.
(dont_repeat): Delete declaration.
* cli/cli-decode.c (add_abbrev_cmd): Delete function.
* cli/cli-dump.c (_initialize_cli_dump): Add declaration.
* reggroups.c (_initialize_reggroup): Add declaration.
* cp-support.c (_initialize_cp_support): Add declaration.
* cp-abi.c (_initialize_cp_abi): Add declaration.
* hpacc-abi.c (_initialize_hpacc_abi): Add declaration.
* gnu-v3-abi.c (gnuv3_baseclass_offset): Make static.
(_initialize_gnu_v3_abi): Add declaration.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Make static.
(_initialize_gnu_v2_abi): Add declaration.
* frame-base.c (_initialize_frame_base): Add declaration.
* doublest.c (floatformat_from_length): Make static.
* frame-unwind.c (_initialize_frame_unwind): Add declaration.
* frame.c (create_sentinel_frame): Make static.
(_initialize_frame): Add declaration.
* top.c (do_catch_errors): Make static.
(gdb_rl_operate_and_get_next_completion): Make static.
* typeprint.c: Include "typeprint.h".
* sentinel-frame.c (sentinel_frame_prev_register): Make static.
(sentinel_frame_this_id): Make static.
* p-valprint.c (_initialize_pascal_valprint): Add declaration.
* ui-out.c (make_cleanup_ui_out_begin_end): Delete function.
* dwarf2-frame.c (dwarf2_frame_cache): Make static.
* p-exp.y (push_current_type, pop_current_type): ISO C declaration.
* dwarf2expr.h (dwarf_expr_context): ISO C declaration.
* maint.c (maintenance_print_architecture): Make static.
* signals/signals.c (_initialize_signals): Add declaration.
* std-regs.c (_initialize_frame_reg): Add declaration.
* jv-exp.y (push_variable): ISO C definition.
(push_qualified_expression_name): Ditto.
* memattr.c (_initialize_mem): Add declaration.
* remote.c (remote_check_watch_resources): Make static.
(remote_stopped_by_watchpoint): Make static.
(remote_stopped_data_address): Make static.
* d10v-tdep.c (nr_dmap_regs): Make static.
(a0_regnum): Make static.
(d10v_frame_unwind_cache): Make static.
(d10v_frame_p): Make static.
* osabi.c (show_osabi): Make static.
(_initialize_gdb_osabi): Add extern declaration.
* gdbtypes.c (make_qualified_type): Make static.
(safe_parse_type): Make static.
* macrocmd.c (_initialize_macrocmd): Add extern declaration.
* macrotab.c (macro_bcache_free): Make static.
* interps.c (interp_set_quiet): Make static.
(interpreter_exec_cmd): Make static.
* stack.h (select_frame_command): New file.
* stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete function.
(select_frame_command): Make global.
* infcall.c: Include "infcall.h".
* linespec.c: Include "linespec.h".
* symfile.c (sections_overlap): Make static.
* cp-support.h (cp_initialize_namespace): ISO C declaration.
* charset.c (_initialize_charset): Add missing prototype.
* regcache.c (init_legacy_regcache_descr): Make static.
(do_regcache_xfree): Make static.
(regcache_xfer_part): Make static.
(_initialize_regcache): Add missing prototype.
* breakpoint.c (parse_breakpoint_sals): Make static.
(breakpoint_sals_to_pc): Make static.
* interps.h (clear_interpreter_hooks): ISO C declaration.
* Makefile.in (stack_h): Define.
(stack.o, typeprint.o, mi-main.o): Update dependencies.
(mi-cmd-stack.o, infcall.o, linespec.o): Update dependencies.
Index: mi/ChangeLog
2003-06-08 Andrew Cagney <cagney@redhat.com>
* mi-parse.c (_initialize_mi_parse): Delete function.
* mi-main.c: Include "mi-main.h".
* mi-interp.c (_initialize_mi_interp): Add declaration.
* mi-cmd-stack.c: Include "stack.h".
(select_frame_command_wrapper): Delete extern declaration.
(mi_cmd_stack_select_frame): Replace select_frame_command_wrapper
with select_frame_command.
2003-06-08 20:27:14 +02:00
|
|
|
#include "mi-main.h"
|
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* inferior.h (registers_info, stepi_command, nexti_command,
continue_command, interrupt_target_command): Export from infcmd.c.
* frame.h (args_info, selected_frame_level_changed_hook,
return_command): Export from stack.c.
* v850ice.c (stepi_command, nexti_command, continue_command): use
prototypes from inferior.h.
* tracepoint.c (registers_info, args_info, locals_info): Use
prototypes from frame.h and inferior.h.
* Makefile.in (mi-main.o): Add dependency on frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Don't use
return_command_wrapper, use return_command instead.
(mi_cmd_exec_interrupt): Don't use
interrupt_target_command_wrapper, use interrupt_target_command
instead.
(return_command_wrapper, interrupt_target_command_wrapper):
Delete.
Include frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* tui-hooks.c (selected_frame_level_changed_hook): Use the one
exported from frame.h.
2002-10-02 23:33:59 +02:00
|
|
|
|
2000-02-23 01:25:43 +01:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
FROM_TTY = 0
|
|
|
|
};
|
|
|
|
|
2002-05-20 20:09:57 +02:00
|
|
|
/* Enumerations of the actions that may result from calling
|
|
|
|
captured_mi_execute_command */
|
|
|
|
|
|
|
|
enum captured_mi_execute_command_actions
|
|
|
|
{
|
|
|
|
EXECUTE_COMMAND_DISPLAY_PROMPT,
|
2005-01-13 23:08:27 +01:00
|
|
|
EXECUTE_COMMAND_SUPRESS_PROMPT
|
2002-05-20 20:09:57 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* This structure is used to pass information from captured_mi_execute_command
|
|
|
|
to mi_execute_command. */
|
|
|
|
struct captured_mi_execute_command_args
|
|
|
|
{
|
|
|
|
/* This return result of the MI command (output) */
|
|
|
|
enum mi_cmd_result rc;
|
|
|
|
|
|
|
|
/* What action to perform when the call is finished (output) */
|
|
|
|
enum captured_mi_execute_command_actions action;
|
|
|
|
|
|
|
|
/* The command context to be executed (input) */
|
|
|
|
struct mi_parse *command;
|
|
|
|
};
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
int mi_debug_p;
|
|
|
|
struct ui_file *raw_stdout;
|
|
|
|
|
|
|
|
/* The token of the last asynchronous command */
|
|
|
|
static char *last_async_command;
|
|
|
|
static char *previous_async_command;
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
char *mi_error_message;
|
2000-02-23 01:25:43 +01:00
|
|
|
static char *old_regs;
|
|
|
|
|
|
|
|
extern void _initialize_mi_main (void);
|
|
|
|
static enum mi_cmd_result mi_cmd_execute (struct mi_parse *parse);
|
|
|
|
|
2003-08-05 01:18:50 +02:00
|
|
|
static void mi_execute_cli_command (const char *cmd, int args_p,
|
|
|
|
const char *args);
|
2000-02-23 01:25:43 +01:00
|
|
|
static enum mi_cmd_result mi_execute_async_cli_command (char *mi, char *args, int from_tty);
|
|
|
|
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
static void mi_exec_async_cli_cmd_continuation (struct continuation_arg *arg);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
static int register_changed_p (int regnum);
|
|
|
|
static int get_register (int regnum, int format);
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
|
2000-02-23 01:25:43 +01:00
|
|
|
/* Command implementations. FIXME: Is this libgdb? No. This is the MI
|
|
|
|
layer that calls libgdb. Any operation used in the below should be
|
|
|
|
formalized. */
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_gdb_exit (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
/* We have to print everything right here because we never return */
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("^exit\n", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
/* FIXME: The function called is not yet a formal libgdb function */
|
|
|
|
quit_force (NULL, FROM_TTY);
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_run (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("run", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_next (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("next", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_next_instruction (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("nexti", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_step (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("step", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_step_instruction (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("stepi", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_finish (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("finish", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_until (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("until", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_return (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* This command doesn't really execute the target, it just pops the
|
|
|
|
specified number of frames. */
|
|
|
|
if (*args)
|
|
|
|
/* Call return_command with from_tty argument equal to 0 so as to
|
|
|
|
avoid being queried. */
|
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* inferior.h (registers_info, stepi_command, nexti_command,
continue_command, interrupt_target_command): Export from infcmd.c.
* frame.h (args_info, selected_frame_level_changed_hook,
return_command): Export from stack.c.
* v850ice.c (stepi_command, nexti_command, continue_command): use
prototypes from inferior.h.
* tracepoint.c (registers_info, args_info, locals_info): Use
prototypes from frame.h and inferior.h.
* Makefile.in (mi-main.o): Add dependency on frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Don't use
return_command_wrapper, use return_command instead.
(mi_cmd_exec_interrupt): Don't use
interrupt_target_command_wrapper, use interrupt_target_command
instead.
(return_command_wrapper, interrupt_target_command_wrapper):
Delete.
Include frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* tui-hooks.c (selected_frame_level_changed_hook): Use the one
exported from frame.h.
2002-10-02 23:33:59 +02:00
|
|
|
return_command (args, 0);
|
2000-02-23 01:25:43 +01:00
|
|
|
else
|
|
|
|
/* Call return_command with from_tty argument equal to 0 so as to
|
|
|
|
avoid being queried. */
|
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* inferior.h (registers_info, stepi_command, nexti_command,
continue_command, interrupt_target_command): Export from infcmd.c.
* frame.h (args_info, selected_frame_level_changed_hook,
return_command): Export from stack.c.
* v850ice.c (stepi_command, nexti_command, continue_command): use
prototypes from inferior.h.
* tracepoint.c (registers_info, args_info, locals_info): Use
prototypes from frame.h and inferior.h.
* Makefile.in (mi-main.o): Add dependency on frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Don't use
return_command_wrapper, use return_command instead.
(mi_cmd_exec_interrupt): Don't use
interrupt_target_command_wrapper, use interrupt_target_command
instead.
(return_command_wrapper, interrupt_target_command_wrapper):
Delete.
Include frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* tui-hooks.c (selected_frame_level_changed_hook): Use the one
exported from frame.h.
2002-10-02 23:33:59 +02:00
|
|
|
return_command (NULL, 0);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* Because we have called return_command with from_tty = 0, we need
|
|
|
|
to print the frame here. */
|
2004-10-29 Andrew Cagney <cagney@gnu.org>
* frame.h (get_selected_frame): Add message parameter.
* frame.c (get_selected_frame): Add and use message parameter.
* stack.c (current_frame_command, return_command, locals_info)
(catch_info, args_info, up_silently_base, down_silently_base): Use
get_selected_frame with an explicit message.
* thread.c, stack.c, sh-tdep.c, sh64-tdep.c: Update.
* remote-rdp.c, remote-mips.c, remote-e7000.c: Update.
* ocd.c, mi/mi-main.c, mi/mi-cmd-stack.c: Update.
* infrun.c, inflow.c, infcmd.c, frame.c: Update.
* findvar.c, eval.c, corelow.c, bsd-kvm.c: Update.
* breakpoint.c: Update.
2004-10-29 22:23:17 +02:00
|
|
|
print_stack_frame (get_selected_frame (NULL), 1, LOC_AND_ADDRESS);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_continue (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
/* FIXME: Should call a libgdb function, not a cli wrapper */
|
|
|
|
return mi_execute_async_cli_command ("continue", args, from_tty);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Interrupt the execution of the target. Note how we must play around
|
|
|
|
with the token varialbes, in order to display the current token in
|
|
|
|
the result of the interrupt command, and the previous execution
|
|
|
|
token when the target finally stops. See comments in
|
|
|
|
mi_cmd_execute. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_exec_interrupt (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
if (!target_executing)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_exec_interrupt: Inferior not executing.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* inferior.h (registers_info, stepi_command, nexti_command,
continue_command, interrupt_target_command): Export from infcmd.c.
* frame.h (args_info, selected_frame_level_changed_hook,
return_command): Export from stack.c.
* v850ice.c (stepi_command, nexti_command, continue_command): use
prototypes from inferior.h.
* tracepoint.c (registers_info, args_info, locals_info): Use
prototypes from frame.h and inferior.h.
* Makefile.in (mi-main.o): Add dependency on frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* mi-main.c (mi_cmd_exec_return): Don't use
return_command_wrapper, use return_command instead.
(mi_cmd_exec_interrupt): Don't use
interrupt_target_command_wrapper, use interrupt_target_command
instead.
(return_command_wrapper, interrupt_target_command_wrapper):
Delete.
Include frame.h.
2002-10-02 Elena Zannoni <ezannoni@redhat.com>
* tui-hooks.c (selected_frame_level_changed_hook): Use the one
exported from frame.h.
2002-10-02 23:33:59 +02:00
|
|
|
interrupt_target_command (args, from_tty);
|
2000-02-23 01:25:43 +01:00
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("^done", raw_stdout);
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (last_async_command);
|
2000-02-23 01:25:43 +01:00
|
|
|
if (previous_async_command)
|
|
|
|
last_async_command = xstrdup (previous_async_command);
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (previous_async_command);
|
2000-02-23 01:25:43 +01:00
|
|
|
previous_async_command = NULL;
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
return MI_CMD_QUIET;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_thread_select (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
enum gdb_rc rc;
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_thread_select: USAGE: threadnum.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
else
|
2005-01-13 23:08:27 +01:00
|
|
|
rc = gdb_thread_select (uiout, argv[0], &mi_error_message);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
2002-10-22 19:53:42 +02:00
|
|
|
/* RC is enum gdb_rc if it is successful (>=0)
|
|
|
|
enum return_reason if not (<0). */
|
|
|
|
if ((int) rc < 0 && (enum return_reason) rc == RETURN_ERROR)
|
2005-01-13 23:08:27 +01:00
|
|
|
return MI_CMD_ERROR;
|
2002-10-22 19:53:42 +02:00
|
|
|
else if ((int) rc >= 0 && rc == GDB_RC_FAIL)
|
|
|
|
return MI_CMD_ERROR;
|
2000-02-23 01:25:43 +01:00
|
|
|
else
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_thread_list_ids (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
enum gdb_rc rc = MI_CMD_DONE;
|
|
|
|
|
|
|
|
if (argc != 0)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_thread_list_ids: No arguments required.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
else
|
2005-01-13 23:08:27 +01:00
|
|
|
rc = gdb_list_thread_ids (uiout, &mi_error_message);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
if (rc == GDB_RC_FAIL)
|
2005-01-13 23:08:27 +01:00
|
|
|
return MI_CMD_ERROR;
|
2000-02-23 01:25:43 +01:00
|
|
|
else
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_list_register_names (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
int regnum, numregs;
|
|
|
|
int i;
|
2002-09-11 23:49:04 +02:00
|
|
|
struct cleanup *cleanup;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* Note that the test for a valid register must include checking the
|
|
|
|
REGISTER_NAME because NUM_REGS may be allocated for the union of
|
|
|
|
the register sets within a family of related processors. In this
|
|
|
|
case, some entries of REGISTER_NAME will change depending upon
|
|
|
|
the particular processor being debugged. */
|
|
|
|
|
2001-06-25 21:02:18 +02:00
|
|
|
numregs = NUM_REGS + NUM_PSEUDO_REGS;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
2002-09-11 23:49:04 +02:00
|
|
|
cleanup = make_cleanup_ui_out_list_begin_end (uiout, "register-names");
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
if (argc == 0) /* No args, just do all the regs */
|
|
|
|
{
|
|
|
|
for (regnum = 0;
|
|
|
|
regnum < numregs;
|
|
|
|
regnum++)
|
|
|
|
{
|
|
|
|
if (REGISTER_NAME (regnum) == NULL
|
|
|
|
|| *(REGISTER_NAME (regnum)) == '\0')
|
2001-06-25 21:02:18 +02:00
|
|
|
ui_out_field_string (uiout, NULL, "");
|
|
|
|
else
|
|
|
|
ui_out_field_string (uiout, NULL, REGISTER_NAME (regnum));
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Else, list of register #s, just do listed regs */
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
{
|
|
|
|
regnum = atoi (argv[i]);
|
2001-06-25 21:02:18 +02:00
|
|
|
if (regnum < 0 || regnum >= numregs)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("bad register number");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
2001-06-25 21:02:18 +02:00
|
|
|
if (REGISTER_NAME (regnum) == NULL
|
|
|
|
|| *(REGISTER_NAME (regnum)) == '\0')
|
|
|
|
ui_out_field_string (uiout, NULL, "");
|
|
|
|
else
|
|
|
|
ui_out_field_string (uiout, NULL, REGISTER_NAME (regnum));
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_list_changed_registers (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
int regnum, numregs, changed;
|
|
|
|
int i;
|
2002-09-11 23:49:04 +02:00
|
|
|
struct cleanup *cleanup;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* Note that the test for a valid register must include checking the
|
|
|
|
REGISTER_NAME because NUM_REGS may be allocated for the union of
|
|
|
|
the register sets within a family of related processors. In this
|
|
|
|
case, some entries of REGISTER_NAME will change depending upon
|
|
|
|
the particular processor being debugged. */
|
|
|
|
|
2004-09-12 17:00:42 +02:00
|
|
|
numregs = NUM_REGS + NUM_PSEUDO_REGS;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
2002-09-11 23:49:04 +02:00
|
|
|
cleanup = make_cleanup_ui_out_list_begin_end (uiout, "changed-registers");
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
if (argc == 0) /* No args, just do all the regs */
|
|
|
|
{
|
|
|
|
for (regnum = 0;
|
|
|
|
regnum < numregs;
|
|
|
|
regnum++)
|
|
|
|
{
|
|
|
|
if (REGISTER_NAME (regnum) == NULL
|
|
|
|
|| *(REGISTER_NAME (regnum)) == '\0')
|
|
|
|
continue;
|
|
|
|
changed = register_changed_p (regnum);
|
|
|
|
if (changed < 0)
|
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_list_changed_registers: Unable to read register contents.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
else if (changed)
|
|
|
|
ui_out_field_int (uiout, NULL, regnum);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Else, list of register #s, just do listed regs */
|
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
{
|
|
|
|
regnum = atoi (argv[i]);
|
|
|
|
|
|
|
|
if (regnum >= 0
|
|
|
|
&& regnum < numregs
|
|
|
|
&& REGISTER_NAME (regnum) != NULL
|
|
|
|
&& *REGISTER_NAME (regnum) != '\000')
|
|
|
|
{
|
|
|
|
changed = register_changed_p (regnum);
|
|
|
|
if (changed < 0)
|
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_list_register_change: Unable to read register contents.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
else if (changed)
|
|
|
|
ui_out_field_int (uiout, NULL, regnum);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("bad register number");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (cleanup);
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
register_changed_p (int regnum)
|
|
|
|
{
|
2003-05-08 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh: Delete references to MAX_REGISTER_RAW_SIZE.
* gdbarch.h: Re-generate.
* defs.h (MAX_REGISTER_RAW_SIZE): Delete macro.
(legacy_max_register_raw_size): Delete declaration.
* regcache.c (legacy_max_register_raw_size): Delete function.
* valops.c: Replace MAX_REGISTER_RAW_SIZE with MAX_REGISTER_SIZE.
* target.c, stack.c, sparc-tdep.c, sh-tdep.c: Update.
* rs6000-tdep.c, rs6000-nat.c, remote.c, remote-sim.c: Update.
* remote-rdp.c, remote-array.c, regcache.c: Update.
* ppc-linux-nat.c, monitor.c, mn10300-tdep.c: Update.
* mips-tdep.c, mips-linux-tdep.c, m68klinux-nat.c: Update.
* infptrace.c, ia64-tdep.c, i386-tdep.c, frame.c: Update.
* findvar.c, dwarf2cfi.c: Update.
Index: tui/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* tuiRegs.c: Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
Index: mi/ChangeLog
2003-05-08 Andrew Cagney <cagney@redhat.com>
* mi-main.c (register_changed_p): Use MAX_REGISTER_SIZE instead of
MAX_REGISTER_RAW_SIZE.
2003-05-08 22:52:49 +02:00
|
|
|
char raw_buffer[MAX_REGISTER_SIZE];
|
2000-02-23 01:25:43 +01:00
|
|
|
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 20:15:16 +01:00
|
|
|
if (! frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
|
2000-02-23 01:25:43 +01:00
|
|
|
return -1;
|
|
|
|
|
2003-09-17 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_BYTE): Rename REGISTER_BYTE.
* gdbarch.h, gdbarch.c: Regenerate.
* arm-linux-tdep.c, core-sol2.c, cris-tdep.c: Update.
* d10v-tdep.c, frame.c: Update.
* hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update.
* hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update.
* ia64-linux-nat.c, irix5-nat.c, lynx-nat.c, m68knbsd-nat.c: Update.
* mcore-tdep.c, mips-linux-tdep.c, mips-tdep.c: Update.
* mipsv4-nat.c, mn10300-tdep.c, ns32k-tdep.c: Update.
* ns32knbsd-nat.c, ppc-bdm.c, regcache.c, remote-sds.c: Update.
* remote-vx68.c, remote-vxmips.c, remote-vxsparc.c: Update.
* remote.c, rs6000-tdep.c, s390-tdep.c, sh64-tdep.c: Update.
* sparc-nat.c, sparc-tdep.c, sun3-nat.c, v850-tdep.c: Update.
* v850ice.c, vax-tdep.c, xstormy16-tdep.c: Update.
* config/m68k/tm-cisco.h, config/m68k/tm-delta68.h: Update.
* config/pa/nm-hppah.h: Update.
2003-09-17 Andrew Cagney <cagney@redhat.com>
* mi/mi-main.c: Rename REGISTER_BYTE to DEPRECATED_REGISTER_BYTE.
2003-09-17 16:24:31 +02:00
|
|
|
if (memcmp (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer,
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
register_size (current_gdbarch, regnum)) == 0)
|
2000-02-23 01:25:43 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Found a changed register. Return 1. */
|
|
|
|
|
2003-09-17 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_BYTE): Rename REGISTER_BYTE.
* gdbarch.h, gdbarch.c: Regenerate.
* arm-linux-tdep.c, core-sol2.c, cris-tdep.c: Update.
* d10v-tdep.c, frame.c: Update.
* hppa-tdep.c, hppab-nat.c, hppah-nat.c, hppam3-nat.c: Update.
* hpux-thread.c, i386gnu-nat.c, ia64-aix-nat.c: Update.
* ia64-linux-nat.c, irix5-nat.c, lynx-nat.c, m68knbsd-nat.c: Update.
* mcore-tdep.c, mips-linux-tdep.c, mips-tdep.c: Update.
* mipsv4-nat.c, mn10300-tdep.c, ns32k-tdep.c: Update.
* ns32knbsd-nat.c, ppc-bdm.c, regcache.c, remote-sds.c: Update.
* remote-vx68.c, remote-vxmips.c, remote-vxsparc.c: Update.
* remote.c, rs6000-tdep.c, s390-tdep.c, sh64-tdep.c: Update.
* sparc-nat.c, sparc-tdep.c, sun3-nat.c, v850-tdep.c: Update.
* v850ice.c, vax-tdep.c, xstormy16-tdep.c: Update.
* config/m68k/tm-cisco.h, config/m68k/tm-delta68.h: Update.
* config/pa/nm-hppah.h: Update.
2003-09-17 Andrew Cagney <cagney@redhat.com>
* mi/mi-main.c: Rename REGISTER_BYTE to DEPRECATED_REGISTER_BYTE.
2003-09-17 16:24:31 +02:00
|
|
|
memcpy (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer,
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
register_size (current_gdbarch, regnum));
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return a list of register number and value pairs. The valid
|
|
|
|
arguments expected are: a letter indicating the format in which to
|
|
|
|
display the registers contents. This can be one of: x (hexadecimal), d
|
|
|
|
(decimal), N (natural), t (binary), o (octal), r (raw). After the
|
|
|
|
format argumetn there can be a sequence of numbers, indicating which
|
|
|
|
registers to fetch the content of. If the format is the only argument,
|
|
|
|
a list of all the registers with their values is returned. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_list_register_values (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
int regnum, numregs, format, result;
|
|
|
|
int i;
|
2002-09-11 23:49:04 +02:00
|
|
|
struct cleanup *list_cleanup, *tuple_cleanup;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* Note that the test for a valid register must include checking the
|
|
|
|
REGISTER_NAME because NUM_REGS may be allocated for the union of
|
|
|
|
the register sets within a family of related processors. In this
|
|
|
|
case, some entries of REGISTER_NAME will change depending upon
|
|
|
|
the particular processor being debugged. */
|
|
|
|
|
2004-09-12 17:00:42 +02:00
|
|
|
numregs = NUM_REGS + NUM_PSEUDO_REGS;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
if (argc == 0)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_list_register_values: Usage: -data-list-register-values <format> [<regnum1>...<regnumN>]");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
format = (int) argv[0][0];
|
|
|
|
|
|
|
|
if (!target_has_registers)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_list_register_values: No registers.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
2002-09-11 23:49:04 +02:00
|
|
|
list_cleanup = make_cleanup_ui_out_list_begin_end (uiout, "register-values");
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
if (argc == 1) /* No args, beside the format: do all the regs */
|
|
|
|
{
|
|
|
|
for (regnum = 0;
|
|
|
|
regnum < numregs;
|
|
|
|
regnum++)
|
|
|
|
{
|
|
|
|
if (REGISTER_NAME (regnum) == NULL
|
|
|
|
|| *(REGISTER_NAME (regnum)) == '\0')
|
|
|
|
continue;
|
2002-09-11 23:49:04 +02:00
|
|
|
tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2000-02-23 01:25:43 +01:00
|
|
|
ui_out_field_int (uiout, "number", regnum);
|
|
|
|
result = get_register (regnum, format);
|
|
|
|
if (result == -1)
|
2002-09-11 23:49:04 +02:00
|
|
|
{
|
|
|
|
do_cleanups (list_cleanup);
|
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
do_cleanups (tuple_cleanup);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Else, list of register #s, just do listed regs */
|
|
|
|
for (i = 1; i < argc; i++)
|
|
|
|
{
|
|
|
|
regnum = atoi (argv[i]);
|
|
|
|
|
|
|
|
if (regnum >= 0
|
|
|
|
&& regnum < numregs
|
|
|
|
&& REGISTER_NAME (regnum) != NULL
|
|
|
|
&& *REGISTER_NAME (regnum) != '\000')
|
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2000-02-23 01:25:43 +01:00
|
|
|
ui_out_field_int (uiout, "number", regnum);
|
|
|
|
result = get_register (regnum, format);
|
|
|
|
if (result == -1)
|
2002-09-11 23:49:04 +02:00
|
|
|
{
|
|
|
|
do_cleanups (list_cleanup);
|
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
do_cleanups (tuple_cleanup);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (list_cleanup);
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("bad register number");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2002-09-11 23:49:04 +02:00
|
|
|
do_cleanups (list_cleanup);
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Output one register's contents in the desired format. */
|
|
|
|
static int
|
|
|
|
get_register (int regnum, int format)
|
|
|
|
{
|
2004-06-09 22:42:29 +02:00
|
|
|
char buffer[MAX_REGISTER_SIZE];
|
2000-02-23 01:25:43 +01:00
|
|
|
int optim;
|
2003-03-14 18:07:01 +01:00
|
|
|
int realnum;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
enum lval_type lval;
|
2000-02-23 01:25:43 +01:00
|
|
|
static struct ui_stream *stb = NULL;
|
|
|
|
|
|
|
|
stb = ui_out_stream_new (uiout);
|
|
|
|
|
|
|
|
if (format == 'N')
|
|
|
|
format = 0;
|
|
|
|
|
2003-03-14 18:07:01 +01:00
|
|
|
frame_register (deprecated_selected_frame, regnum, &optim, &lval, &addr,
|
2004-06-09 22:42:29 +02:00
|
|
|
&realnum, buffer);
|
2003-03-14 18:07:01 +01:00
|
|
|
|
2000-02-23 01:25:43 +01:00
|
|
|
if (optim)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("Optimized out");
|
2000-02-23 01:25:43 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (format == 'r')
|
|
|
|
{
|
|
|
|
int j;
|
|
|
|
char *ptr, buf[1024];
|
|
|
|
|
|
|
|
strcpy (buf, "0x");
|
|
|
|
ptr = buf + 2;
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
for (j = 0; j < register_size (current_gdbarch, regnum); j++)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2003-09-20 19:50:28 +02:00
|
|
|
int idx = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? j
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
: register_size (current_gdbarch, regnum) - 1 - j;
|
2004-06-09 22:42:29 +02:00
|
|
|
sprintf (ptr, "%02x", (unsigned char) buffer[idx]);
|
2000-02-23 01:25:43 +01:00
|
|
|
ptr += 2;
|
|
|
|
}
|
|
|
|
ui_out_field_string (uiout, "value", buf);
|
|
|
|
/*fputs_filtered (buf, gdb_stdout); */
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-06-09 22:42:29 +02:00
|
|
|
val_print (register_type (current_gdbarch, regnum), buffer, 0, 0,
|
2000-02-23 01:25:43 +01:00
|
|
|
stb->stream, format, 1, 0, Val_pretty_default);
|
|
|
|
ui_out_field_stream (uiout, "value", stb);
|
|
|
|
ui_out_stream_delete (stb);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-03-06 23:57:52 +01:00
|
|
|
/* Write given values into registers. The registers and values are
|
|
|
|
given as pairs. The corresponding MI command is
|
|
|
|
-data-write-register-values <format> [<regnum1> <value1>...<regnumN> <valueN>]*/
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_write_register_values (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
int regnum;
|
|
|
|
int i;
|
|
|
|
int numregs;
|
|
|
|
LONGEST value;
|
|
|
|
char format;
|
|
|
|
|
|
|
|
/* Note that the test for a valid register must include checking the
|
|
|
|
REGISTER_NAME because NUM_REGS may be allocated for the union of
|
|
|
|
the register sets within a family of related processors. In this
|
|
|
|
case, some entries of REGISTER_NAME will change depending upon
|
|
|
|
the particular processor being debugged. */
|
|
|
|
|
2004-09-12 17:00:42 +02:00
|
|
|
numregs = NUM_REGS + NUM_PSEUDO_REGS;
|
2000-03-06 23:57:52 +01:00
|
|
|
|
|
|
|
if (argc == 0)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_write_register_values: Usage: -data-write-register-values <format> [<regnum1> <value1>...<regnumN> <valueN>]");
|
2000-03-06 23:57:52 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
format = (int) argv[0][0];
|
|
|
|
|
|
|
|
if (!target_has_registers)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_write_register_values: No registers.");
|
2000-03-06 23:57:52 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(argc - 1))
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_write_register_values: No regs and values specified.");
|
2000-03-06 23:57:52 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((argc - 1) % 2)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_write_register_values: Regs and vals are not in pairs.");
|
2000-03-06 23:57:52 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 1; i < argc; i = i + 2)
|
|
|
|
{
|
|
|
|
regnum = atoi (argv[i]);
|
|
|
|
|
|
|
|
if (regnum >= 0
|
|
|
|
&& regnum < numregs
|
|
|
|
&& REGISTER_NAME (regnum) != NULL
|
|
|
|
&& *REGISTER_NAME (regnum) != '\000')
|
|
|
|
{
|
2001-07-09 18:53:03 +02:00
|
|
|
void *buffer;
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
2000-03-06 23:57:52 +01:00
|
|
|
/* Get the value as a number */
|
|
|
|
value = parse_and_eval_address (argv[i + 1]);
|
|
|
|
/* Get the value into an array */
|
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_SIZE): Rename REGISTER_SIZE.
(DEPRECATED_SIZEOF_CALL_DUMMY_WORDS): Rename
SIZEOF_CALL_DUMMY_WORDS.
(DEPRECATED_CALL_DUMMY_WORDS): Rename CALL_DUMMY_WORDS.
(DEPRECATED_FIX_CALL_DUMMY): Rename FIX_CALL_DUMMY.
(DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET): Rename
CALL_DUMMY_BREAKPOINT_OFFSET.
(DEPRECATED_CALL_DUMMY_START_OFFSET): Rename
CALL_DUMMY_START_OFFSET.
(DEPRECATED_CALL_DUMMY_LENGTH): Rename CALL_DUMMY_LENGTH.
* gdbarch.h, gdbarch.c: Re-generate.
* alpha-tdep.c, alphafbsd-tdep.c, arm-linux-tdep.c: Update.
* arm-tdep.c, avr-tdep.c, breakpoint.c, cris-tdep.c: Update.
* dummy-frame.c, dummy-frame.h, frv-tdep.c, gdbarch.c: Update.
* gdbarch.h, gdbarch.sh, h8300-tdep.c, hppa-tdep.c: Update.
* i386-tdep.c, ia64-tdep.c, infcall.c, inferior.h: Update.
* m68hc11-tdep.c, m68k-tdep.c, mcore-tdep.c: Update.
* mips-tdep.c, mn10300-tdep.c, ns32k-tdep.c: Update.
* rs6000-tdep.c, s390-tdep.c, sh-tdep.c, sol-thread.c: Update.
* sparc-tdep.c, target.c, v850-tdep.c, valops.c: Update.
* vax-tdep.c, x86-64-tdep.c, xstormy16-tdep.c: Update.
* config/ia64/tm-ia64.h, config/m68k/tm-vx68.h: Update.
* config/mips/tm-mips.h, config/pa/nm-hppah.h: Update.
* config/pa/tm-hppa.h, config/pa/tm-hppa64.h: Update.
* config/s390/tm-s390.h, config/sparc/tm-sp64.h: Update.
* config/sparc/tm-sparc.h: Update.
Index: doc/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Make
CALL_DUMMY_WORDS, SIZEOF_CALL_DUMMY_WORDS, CALL_DUMMY_LENGTH,
FIX_CALL_DUMMY, CALL_DUMMY_BREAKPOINT_OFFSET and
CALL_DUMMY_BREAKPOINT_OFFSET deprecated.
Index: mi/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* mi-main.c (mi_cmd_data_write_register_values): Replace
REGISTER_SIZE with DEPRECATED_REGISTER_SIZE.
Index: testsuite/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdb.base/watchpoint.exp: Rename CALL_DUMMY_BREAKPOINT_OFFSET to
DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET in comments.
2003-05-05 19:56:57 +02:00
|
|
|
buffer = xmalloc (DEPRECATED_REGISTER_SIZE);
|
2001-07-09 18:53:03 +02:00
|
|
|
old_chain = make_cleanup (xfree, buffer);
|
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (DEPRECATED_REGISTER_SIZE): Rename REGISTER_SIZE.
(DEPRECATED_SIZEOF_CALL_DUMMY_WORDS): Rename
SIZEOF_CALL_DUMMY_WORDS.
(DEPRECATED_CALL_DUMMY_WORDS): Rename CALL_DUMMY_WORDS.
(DEPRECATED_FIX_CALL_DUMMY): Rename FIX_CALL_DUMMY.
(DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET): Rename
CALL_DUMMY_BREAKPOINT_OFFSET.
(DEPRECATED_CALL_DUMMY_START_OFFSET): Rename
CALL_DUMMY_START_OFFSET.
(DEPRECATED_CALL_DUMMY_LENGTH): Rename CALL_DUMMY_LENGTH.
* gdbarch.h, gdbarch.c: Re-generate.
* alpha-tdep.c, alphafbsd-tdep.c, arm-linux-tdep.c: Update.
* arm-tdep.c, avr-tdep.c, breakpoint.c, cris-tdep.c: Update.
* dummy-frame.c, dummy-frame.h, frv-tdep.c, gdbarch.c: Update.
* gdbarch.h, gdbarch.sh, h8300-tdep.c, hppa-tdep.c: Update.
* i386-tdep.c, ia64-tdep.c, infcall.c, inferior.h: Update.
* m68hc11-tdep.c, m68k-tdep.c, mcore-tdep.c: Update.
* mips-tdep.c, mn10300-tdep.c, ns32k-tdep.c: Update.
* rs6000-tdep.c, s390-tdep.c, sh-tdep.c, sol-thread.c: Update.
* sparc-tdep.c, target.c, v850-tdep.c, valops.c: Update.
* vax-tdep.c, x86-64-tdep.c, xstormy16-tdep.c: Update.
* config/ia64/tm-ia64.h, config/m68k/tm-vx68.h: Update.
* config/mips/tm-mips.h, config/pa/nm-hppah.h: Update.
* config/pa/tm-hppa.h, config/pa/tm-hppa64.h: Update.
* config/s390/tm-s390.h, config/sparc/tm-sp64.h: Update.
* config/sparc/tm-sparc.h: Update.
Index: doc/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Make
CALL_DUMMY_WORDS, SIZEOF_CALL_DUMMY_WORDS, CALL_DUMMY_LENGTH,
FIX_CALL_DUMMY, CALL_DUMMY_BREAKPOINT_OFFSET and
CALL_DUMMY_BREAKPOINT_OFFSET deprecated.
Index: mi/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* mi-main.c (mi_cmd_data_write_register_values): Replace
REGISTER_SIZE with DEPRECATED_REGISTER_SIZE.
Index: testsuite/ChangeLog
2003-05-03 Andrew Cagney <cagney@redhat.com>
* gdb.base/watchpoint.exp: Rename CALL_DUMMY_BREAKPOINT_OFFSET to
DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET in comments.
2003-05-05 19:56:57 +02:00
|
|
|
store_signed_integer (buffer, DEPRECATED_REGISTER_SIZE, value);
|
2000-03-06 23:57:52 +01:00
|
|
|
/* Write it down */
|
2004-08-02 Andrew Cagney <cagney@gnu.org>
Replace DEPRECATED_REGISTER_RAW_SIZE with register_size.
* rs6000-tdep.c (rs6000_push_dummy_call)
(rs6000_extract_return_value): Use register_size.
* xstormy16-tdep.c (xstormy16_get_saved_register)
(xstormy16_extract_return_value): Ditto.
* valops.c (value_assign): Ditto.
* v850ice.c (v850ice_fetch_registers, v850ice_store_registers):
* v850-tdep.c (v850_extract_return_value): Ditto.
* tracepoint.c (collect_symbol): Ditto.
* target.c (debug_print_register): Ditto.
* stack.c (frame_info): Ditto.
* rs6000-nat.c (ARCH64, fetch_register, store_register): Ditto.
* rom68k-rom.c (rom68k_supply_one_register): Ditto.
* remote.c (struct packet_reg, remote_wait, remote_async_wait)
(store_register_using_P): Ditto.
* remote-vxmips.c (vx_read_register, vx_write_register): Ditto.
* remote-sim.c (gdbsim_fetch_register, gdbsim_store_register): Ditto.
* remote-mips.c (mips_wait, mips_fetch_registers): Ditto.
* remote-e7000.c (fetch_regs_from_dump, sub2_from_pc): Ditto.
* regcache.c (deprecated_read_register_bytes)
(deprecated_write_register_bytes, read_register)
(write_register): Ditto.
* ppc-linux-nat.c (fetch_altivec_register, fetch_register)
(supply_vrregset, store_altivec_register, fill_vrregset): Ditto.
* monitor.c (monitor_supply_register, monitor_fetch_register)
(monitor_store_register): Ditto.
* mn10300-tdep.c (mn10300_pop_frame_regular)
(mn10300_print_register): Ditto.
* mipsv4-nat.c (fill_fpregset): Ditto.
* mips-linux-tdep.c (supply_32bit_reg, fill_fpregset)
(mips64_fill_fpregset): Ditto.
* mi/mi-main.c (register_changed_p, get_register)
(mi_cmd_data_write_register_values): Ditto.
* lynx-nat.c (fetch_inferior_registers, store_inferior_registers):
* irix5-nat.c (fill_gregset, fetch_core_registers):
* infrun.c (write_inferior_status_register): Ditto.
* infptrace.c (fetch_register, store_register): Ditto.
* infcmd.c (default_print_registers_info): Ditto.
* ia64-linux-nat.c (COPY_REG, fill_fpregset): Ditto.
* ia64-aix-nat.c (COPY_REG, fill_gregset): Ditto.
* i386gnu-nat.c (gnu_store_registers, fill): Ditto.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Ditto.
* hppah-nat.c (store_inferior_registers, fetch_register):
* findvar.c (value_from_register): Ditto.
* dve3900-rom.c (fetch_bitmapped_register):
* cris-tdep.c (cris_gdbarch_init): Ditto.
* alpha-tdep.h: Ditto.
* aix-thread.c (pd_enable, fill_sprs64, fill_sprs32): Ditto.
2004-08-03 02:57:27 +02:00
|
|
|
deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), buffer, register_size (current_gdbarch, regnum));
|
2001-07-09 18:53:03 +02:00
|
|
|
/* Free the buffer. */
|
|
|
|
do_cleanups (old_chain);
|
2000-03-06 23:57:52 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("bad register number");
|
2000-03-06 23:57:52 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
2000-02-23 01:25:43 +01:00
|
|
|
#if 0
|
|
|
|
/*This is commented out because we decided it was not useful. I leave
|
|
|
|
it, just in case. ezannoni:1999-12-08 */
|
|
|
|
|
|
|
|
/* Assign a value to a variable. The expression argument must be in
|
|
|
|
the form A=2 or "A = 2" (I.e. if there are spaces it needs to be
|
|
|
|
quoted. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_assign (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
struct expression *expr;
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_assign: Usage: -data-assign expression");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE what follows is a clone of set_command(). FIXME: ezannoni
|
|
|
|
01-12-1999: Need to decide what to do with this for libgdb purposes. */
|
|
|
|
|
|
|
|
expr = parse_expression (argv[0]);
|
2000-05-15 13:48:50 +02:00
|
|
|
old_chain = make_cleanup (free_current_contents, &expr);
|
2000-02-23 01:25:43 +01:00
|
|
|
evaluate_expression (expr);
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Evaluate the value of the argument. The argument is an
|
|
|
|
expression. If the expression contains spaces it needs to be
|
|
|
|
included in double quotes. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_evaluate_expression (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
struct expression *expr;
|
|
|
|
struct cleanup *old_chain = NULL;
|
2001-07-09 16:50:37 +02:00
|
|
|
struct value *val;
|
2000-02-23 01:25:43 +01:00
|
|
|
struct ui_stream *stb = NULL;
|
|
|
|
|
|
|
|
stb = ui_out_stream_new (uiout);
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_evaluate_expression: Usage: -data-evaluate-expression expression");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
expr = parse_expression (argv[0]);
|
|
|
|
|
2000-05-15 13:48:50 +02:00
|
|
|
old_chain = make_cleanup (free_current_contents, &expr);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
val = evaluate_expression (expr);
|
|
|
|
|
|
|
|
/* Print the result of the expression evaluation. */
|
2005-02-06 Andrew Cagney <cagney@gnu.org>
* value.c (value_contents, value_contents_writeable): New
functions.
* value.h (VALUE_CONTENTS): Delete macro.
(value_contents, value_contents_writeable): Declare.
* xstormy16-tdep.c, value.c, valops.c, valarith.c: Update.
* stack.c, sparc-tdep.c, sparc64-tdep.c, sh-tdep.c: Update.
* sh64-tdep.c, scm-valprint.c, scm-exp.c, s390-tdep.c: Update.
* rs6000-tdep.c, p-valprint.c, printcmd.c: Update.
* ppc-sysv-tdep.c, mips-tdep.c, mi/mi-main.c: Update.
* m88k-tdep.c, m68hc11-tdep.c, m32r-tdep.c: Update.
* jv-valprint.c, ia64-tdep.c, hppa-tdep.c: Update.
* hpacc-abi.c, f-valprint.c, frv-tdep.c, eval.c: Update.
* c-valprint.c, cris-tdep.c, cp-valprint.c: Update.
* cli/cli-dump.c, breakpoint.c, avr-tdep.c, arm-tdep.c: Update.
* arm-linux-tdep.c, amd64-tdep.c, alpha-tdep.c: Update.
* ada-valprint.c, ada-lang.c: Update.
2005-02-07 01:09:56 +01:00
|
|
|
val_print (value_type (val), value_contents (val),
|
2005-02-07 18:06:29 +01:00
|
|
|
value_embedded_offset (val), VALUE_ADDRESS (val),
|
2000-02-23 01:25:43 +01:00
|
|
|
stb->stream, 0, 0, 0, 0);
|
|
|
|
|
|
|
|
ui_out_field_stream (uiout, "value", stb);
|
|
|
|
ui_out_stream_delete (stb);
|
|
|
|
|
|
|
|
do_cleanups (old_chain);
|
|
|
|
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_target_download (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
char *run;
|
|
|
|
struct cleanup *old_cleanups = NULL;
|
|
|
|
|
2004-06-01 15:33:58 +02:00
|
|
|
run = xstrprintf ("load %s", args);
|
2000-12-15 02:01:51 +01:00
|
|
|
old_cleanups = make_cleanup (xfree, run);
|
2000-02-23 01:25:43 +01:00
|
|
|
execute_command (run, from_tty);
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Connect to the remote target. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_target_select (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
char *run;
|
|
|
|
struct cleanup *old_cleanups = NULL;
|
|
|
|
|
2004-06-01 15:33:58 +02:00
|
|
|
run = xstrprintf ("target %s", args);
|
2000-12-15 02:01:51 +01:00
|
|
|
old_cleanups = make_cleanup (xfree, run);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* target-select is always synchronous. once the call has returned
|
|
|
|
we know that we are connected. */
|
|
|
|
/* NOTE: At present all targets that are connected are also
|
|
|
|
(implicitly) talking to a halted target. In the future this may
|
|
|
|
change. */
|
|
|
|
execute_command (run, from_tty);
|
|
|
|
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
|
|
|
|
/* Issue the completion message here. */
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("^connected", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
do_exec_cleanups (ALL_CLEANUPS);
|
|
|
|
return MI_CMD_QUIET;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* DATA-MEMORY-READ:
|
|
|
|
|
|
|
|
ADDR: start address of data to be dumped.
|
|
|
|
WORD-FORMAT: a char indicating format for the ``word''. See
|
|
|
|
the ``x'' command.
|
|
|
|
WORD-SIZE: size of each ``word''; 1,2,4, or 8 bytes
|
|
|
|
NR_ROW: Number of rows.
|
|
|
|
NR_COL: The number of colums (words per row).
|
|
|
|
ASCHAR: (OPTIONAL) Append an ascii character dump to each row. Use
|
|
|
|
ASCHAR for unprintable characters.
|
|
|
|
|
|
|
|
Reads SIZE*NR_ROW*NR_COL bytes starting at ADDR from memory and
|
|
|
|
displayes them. Returns:
|
|
|
|
|
|
|
|
{addr="...",rowN={wordN="..." ,... [,ascii="..."]}, ...}
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
The number of bytes read is SIZE*ROW*COL. */
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_read_memory (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
|
|
|
|
CORE_ADDR addr;
|
|
|
|
long total_bytes;
|
|
|
|
long nr_cols;
|
|
|
|
long nr_rows;
|
|
|
|
char word_format;
|
|
|
|
struct type *word_type;
|
|
|
|
long word_size;
|
|
|
|
char word_asize;
|
|
|
|
char aschar;
|
|
|
|
char *mbuf;
|
|
|
|
int nr_bytes;
|
|
|
|
long offset = 0;
|
|
|
|
int optind = 0;
|
|
|
|
char *optarg;
|
|
|
|
enum opt
|
|
|
|
{
|
|
|
|
OFFSET_OPT
|
|
|
|
};
|
|
|
|
static struct mi_opt opts[] =
|
|
|
|
{
|
|
|
|
{"o", OFFSET_OPT, 1},
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int opt = mi_getopt ("mi_cmd_data_read_memory", argc, argv, opts,
|
|
|
|
&optind, &optarg);
|
|
|
|
if (opt < 0)
|
|
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
|
|
{
|
|
|
|
case OFFSET_OPT:
|
|
|
|
offset = atol (optarg);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
argv += optind;
|
|
|
|
argc -= optind;
|
|
|
|
|
|
|
|
if (argc < 5 || argc > 6)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_read_memory: Usage: ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS [ASCHAR].");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract all the arguments. */
|
|
|
|
|
|
|
|
/* Start address of the memory dump. */
|
|
|
|
addr = parse_and_eval_address (argv[0]) + offset;
|
|
|
|
/* The format character to use when displaying a memory word. See
|
|
|
|
the ``x'' command. */
|
|
|
|
word_format = argv[1][0];
|
|
|
|
/* The size of the memory word. */
|
|
|
|
word_size = atol (argv[2]);
|
|
|
|
switch (word_size)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
word_type = builtin_type_int8;
|
|
|
|
word_asize = 'b';
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
word_type = builtin_type_int16;
|
|
|
|
word_asize = 'h';
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
word_type = builtin_type_int32;
|
|
|
|
word_asize = 'w';
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
word_type = builtin_type_int64;
|
|
|
|
word_asize = 'g';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
word_type = builtin_type_int8;
|
|
|
|
word_asize = 'b';
|
|
|
|
}
|
|
|
|
/* The number of rows */
|
|
|
|
nr_rows = atol (argv[3]);
|
|
|
|
if (nr_rows <= 0)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_read_memory: invalid number of rows.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
/* number of bytes per row. */
|
|
|
|
nr_cols = atol (argv[4]);
|
|
|
|
if (nr_cols <= 0)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_read_memory: invalid number of columns.");
|
2004-06-01 14:55:33 +02:00
|
|
|
return MI_CMD_ERROR;
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
/* The un-printable character when printing ascii. */
|
|
|
|
if (argc == 6)
|
|
|
|
aschar = *argv[5];
|
|
|
|
else
|
|
|
|
aschar = 0;
|
|
|
|
|
|
|
|
/* create a buffer and read it in. */
|
|
|
|
total_bytes = word_size * nr_rows * nr_cols;
|
2001-03-29 01:21:43 +02:00
|
|
|
mbuf = xcalloc (total_bytes, 1);
|
2000-12-15 02:01:51 +01:00
|
|
|
make_cleanup (xfree, mbuf);
|
2000-02-23 01:25:43 +01:00
|
|
|
nr_bytes = 0;
|
|
|
|
while (nr_bytes < total_bytes)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
long num = target_read_memory_partial (addr + nr_bytes, mbuf + nr_bytes,
|
|
|
|
total_bytes - nr_bytes,
|
|
|
|
&error);
|
|
|
|
if (num <= 0)
|
|
|
|
break;
|
|
|
|
nr_bytes += num;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* output the header information. */
|
|
|
|
ui_out_field_core_addr (uiout, "addr", addr);
|
|
|
|
ui_out_field_int (uiout, "nr-bytes", nr_bytes);
|
|
|
|
ui_out_field_int (uiout, "total-bytes", total_bytes);
|
|
|
|
ui_out_field_core_addr (uiout, "next-row", addr + word_size * nr_cols);
|
|
|
|
ui_out_field_core_addr (uiout, "prev-row", addr - word_size * nr_cols);
|
|
|
|
ui_out_field_core_addr (uiout, "next-page", addr + total_bytes);
|
|
|
|
ui_out_field_core_addr (uiout, "prev-page", addr - total_bytes);
|
|
|
|
|
|
|
|
/* Build the result as a two dimentional table. */
|
|
|
|
{
|
|
|
|
struct ui_stream *stream = ui_out_stream_new (uiout);
|
2002-10-23 23:17:51 +02:00
|
|
|
struct cleanup *cleanup_list_memory;
|
2000-02-23 01:25:43 +01:00
|
|
|
int row;
|
|
|
|
int row_byte;
|
2002-10-23 23:17:51 +02:00
|
|
|
cleanup_list_memory = make_cleanup_ui_out_list_begin_end (uiout, "memory");
|
2000-02-23 01:25:43 +01:00
|
|
|
for (row = 0, row_byte = 0;
|
|
|
|
row < nr_rows;
|
|
|
|
row++, row_byte += nr_cols * word_size)
|
|
|
|
{
|
|
|
|
int col;
|
|
|
|
int col_byte;
|
2002-10-23 23:17:51 +02:00
|
|
|
struct cleanup *cleanup_tuple;
|
|
|
|
struct cleanup *cleanup_list_data;
|
|
|
|
cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2000-02-23 01:25:43 +01:00
|
|
|
ui_out_field_core_addr (uiout, "addr", addr + row_byte);
|
|
|
|
/* ui_out_field_core_addr_symbolic (uiout, "saddr", addr + row_byte); */
|
2002-10-23 23:17:51 +02:00
|
|
|
cleanup_list_data = make_cleanup_ui_out_list_begin_end (uiout, "data");
|
2000-02-23 01:25:43 +01:00
|
|
|
for (col = 0, col_byte = row_byte;
|
|
|
|
col < nr_cols;
|
|
|
|
col++, col_byte += word_size)
|
|
|
|
{
|
|
|
|
if (col_byte + word_size > nr_bytes)
|
|
|
|
{
|
|
|
|
ui_out_field_string (uiout, NULL, "N/A");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ui_file_rewind (stream->stream);
|
|
|
|
print_scalar_formatted (mbuf + col_byte, word_type, word_format,
|
|
|
|
word_asize, stream->stream);
|
|
|
|
ui_out_field_stream (uiout, NULL, stream);
|
|
|
|
}
|
|
|
|
}
|
2002-10-23 23:17:51 +02:00
|
|
|
do_cleanups (cleanup_list_data);
|
2000-02-23 01:25:43 +01:00
|
|
|
if (aschar)
|
|
|
|
{
|
|
|
|
int byte;
|
|
|
|
ui_file_rewind (stream->stream);
|
|
|
|
for (byte = row_byte; byte < row_byte + word_size * nr_cols; byte++)
|
|
|
|
{
|
|
|
|
if (byte >= nr_bytes)
|
|
|
|
{
|
|
|
|
fputc_unfiltered ('X', stream->stream);
|
|
|
|
}
|
|
|
|
else if (mbuf[byte] < 32 || mbuf[byte] > 126)
|
|
|
|
{
|
|
|
|
fputc_unfiltered (aschar, stream->stream);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
fputc_unfiltered (mbuf[byte], stream->stream);
|
|
|
|
}
|
|
|
|
ui_out_field_stream (uiout, "ascii", stream);
|
|
|
|
}
|
2002-10-23 23:17:51 +02:00
|
|
|
do_cleanups (cleanup_tuple);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
ui_out_stream_delete (stream);
|
2002-10-23 23:17:51 +02:00
|
|
|
do_cleanups (cleanup_list_memory);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
do_cleanups (cleanups);
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* DATA-MEMORY-WRITE:
|
|
|
|
|
|
|
|
COLUMN_OFFSET: optional argument. Must be preceeded by '-o'. The
|
|
|
|
offset from the beginning of the memory grid row where the cell to
|
|
|
|
be written is.
|
|
|
|
ADDR: start address of the row in the memory grid where the memory
|
|
|
|
cell is, if OFFSET_COLUMN is specified. Otherwise, the address of
|
|
|
|
the location to write to.
|
|
|
|
FORMAT: a char indicating format for the ``word''. See
|
|
|
|
the ``x'' command.
|
|
|
|
WORD_SIZE: size of each ``word''; 1,2,4, or 8 bytes
|
|
|
|
VALUE: value to be written into the memory address.
|
|
|
|
|
|
|
|
Writes VALUE into ADDR + (COLUMN_OFFSET * WORD_SIZE).
|
|
|
|
|
|
|
|
Prints nothing. */
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_cmd_data_write_memory (char *command, char **argv, int argc)
|
|
|
|
{
|
|
|
|
CORE_ADDR addr;
|
|
|
|
char word_format;
|
|
|
|
long word_size;
|
|
|
|
/* FIXME: ezannoni 2000-02-17 LONGEST could possibly not be big
|
|
|
|
enough when using a compiler other than GCC. */
|
|
|
|
LONGEST value;
|
2001-07-09 18:53:03 +02:00
|
|
|
void *buffer;
|
|
|
|
struct cleanup *old_chain;
|
2000-02-23 01:25:43 +01:00
|
|
|
long offset = 0;
|
|
|
|
int optind = 0;
|
|
|
|
char *optarg;
|
|
|
|
enum opt
|
|
|
|
{
|
|
|
|
OFFSET_OPT
|
|
|
|
};
|
|
|
|
static struct mi_opt opts[] =
|
|
|
|
{
|
|
|
|
{"o", OFFSET_OPT, 1},
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
int opt = mi_getopt ("mi_cmd_data_write_memory", argc, argv, opts,
|
|
|
|
&optind, &optarg);
|
|
|
|
if (opt < 0)
|
|
|
|
break;
|
|
|
|
switch ((enum opt) opt)
|
|
|
|
{
|
|
|
|
case OFFSET_OPT:
|
|
|
|
offset = atol (optarg);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
argv += optind;
|
|
|
|
argc -= optind;
|
|
|
|
|
|
|
|
if (argc != 4)
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
mi_error_message = xstrprintf ("mi_cmd_data_write_memory: Usage: [-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE.");
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Extract all the arguments. */
|
|
|
|
/* Start address of the memory dump. */
|
|
|
|
addr = parse_and_eval_address (argv[0]);
|
|
|
|
/* The format character to use when displaying a memory word. See
|
|
|
|
the ``x'' command. */
|
|
|
|
word_format = argv[1][0];
|
|
|
|
/* The size of the memory word. */
|
|
|
|
word_size = atol (argv[2]);
|
|
|
|
|
|
|
|
/* Calculate the real address of the write destination. */
|
|
|
|
addr += (offset * word_size);
|
|
|
|
|
|
|
|
/* Get the value as a number */
|
|
|
|
value = parse_and_eval_address (argv[3]);
|
|
|
|
/* Get the value into an array */
|
2001-07-09 18:53:03 +02:00
|
|
|
buffer = xmalloc (word_size);
|
|
|
|
old_chain = make_cleanup (xfree, buffer);
|
2000-02-23 01:25:43 +01:00
|
|
|
store_signed_integer (buffer, word_size, value);
|
|
|
|
/* Write it down to memory */
|
|
|
|
write_memory (addr, buffer, word_size);
|
2001-07-09 18:53:03 +02:00
|
|
|
/* Free the buffer. */
|
|
|
|
do_cleanups (old_chain);
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
2002-05-20 20:09:57 +02:00
|
|
|
/* Execute a command within a safe environment.
|
|
|
|
Return <0 for error; >=0 for ok.
|
|
|
|
|
|
|
|
args->action will tell mi_execute_command what action
|
|
|
|
to perfrom after the given command has executed (display/supress
|
|
|
|
prompt, display error). */
|
2000-02-23 01:25:43 +01:00
|
|
|
|
2005-01-13 19:15:02 +01:00
|
|
|
static void
|
2002-05-20 20:09:57 +02:00
|
|
|
captured_mi_execute_command (struct ui_out *uiout, void *data)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2002-05-20 20:09:57 +02:00
|
|
|
struct captured_mi_execute_command_args *args =
|
|
|
|
(struct captured_mi_execute_command_args *) data;
|
|
|
|
struct mi_parse *context = args->command;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
switch (context->op)
|
|
|
|
{
|
|
|
|
|
|
|
|
case MI_COMMAND:
|
|
|
|
/* A MI command was read from the input stream */
|
|
|
|
if (mi_debug_p)
|
|
|
|
/* FIXME: gdb_???? */
|
|
|
|
fprintf_unfiltered (raw_stdout, " token=`%s' command=`%s' args=`%s'\n",
|
|
|
|
context->token, context->command, context->args);
|
|
|
|
/* FIXME: cagney/1999-09-25: Rather than this convoluted
|
|
|
|
condition expression, each function should return an
|
|
|
|
indication of what action is required and then switch on
|
|
|
|
that. */
|
2002-05-20 20:09:57 +02:00
|
|
|
args->action = EXECUTE_COMMAND_DISPLAY_PROMPT;
|
|
|
|
args->rc = mi_cmd_execute (context);
|
|
|
|
|
2000-02-23 01:25:43 +01:00
|
|
|
if (!target_can_async_p () || !target_executing)
|
|
|
|
{
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
/* print the result if there were no errors
|
|
|
|
|
|
|
|
Remember that on the way out of executing a command, you have
|
|
|
|
to directly use the mi_interp's uiout, since the command could
|
|
|
|
have reset the interpreter, in which case the current uiout
|
|
|
|
will most likely crash in the mi_out_* routines. */
|
2002-05-20 20:09:57 +02:00
|
|
|
if (args->rc == MI_CMD_DONE)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
fputs_unfiltered (context->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^done", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
}
|
2002-05-20 20:09:57 +02:00
|
|
|
else if (args->rc == MI_CMD_ERROR)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
if (mi_error_message)
|
|
|
|
{
|
|
|
|
fputs_unfiltered (context->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^error,msg=\"", raw_stdout);
|
|
|
|
fputstr_unfiltered (mi_error_message, '"', raw_stdout);
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (mi_error_message);
|
2000-02-23 01:25:43 +01:00
|
|
|
fputs_unfiltered ("\"\n", raw_stdout);
|
|
|
|
}
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
}
|
|
|
|
else if (sync_execution)
|
2002-05-20 20:09:57 +02:00
|
|
|
{
|
|
|
|
/* Don't print the prompt. We are executing the target in
|
|
|
|
synchronous mode. */
|
|
|
|
args->action = EXECUTE_COMMAND_SUPRESS_PROMPT;
|
2005-01-13 19:15:02 +01:00
|
|
|
return;
|
2002-05-20 20:09:57 +02:00
|
|
|
}
|
2000-02-23 01:25:43 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CLI_COMMAND:
|
|
|
|
/* A CLI command was read from the input stream */
|
|
|
|
/* This will be removed as soon as we have a complete set of
|
|
|
|
mi commands */
|
|
|
|
/* echo the command on the console. */
|
|
|
|
fprintf_unfiltered (gdb_stdlog, "%s\n", context->command);
|
2003-08-05 01:18:50 +02:00
|
|
|
mi_execute_cli_command (context->command, 0, NULL);
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
|
|
|
|
/* If we changed interpreters, DON'T print out anything. */
|
|
|
|
if (current_interp_named_p (INTERP_MI)
|
2003-08-08 21:00:08 +02:00
|
|
|
|| current_interp_named_p (INTERP_MI1)
|
|
|
|
|| current_interp_named_p (INTERP_MI2)
|
|
|
|
|| current_interp_named_p (INTERP_MI3))
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
{
|
|
|
|
/* print the result */
|
|
|
|
/* FIXME: Check for errors here. */
|
|
|
|
fputs_unfiltered (context->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^done", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
args->action = EXECUTE_COMMAND_DISPLAY_PROMPT;
|
|
|
|
args->rc = MI_CMD_DONE;
|
|
|
|
}
|
2000-02-23 01:25:43 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
2002-05-20 20:09:57 +02:00
|
|
|
|
2005-01-13 19:15:02 +01:00
|
|
|
return;
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
mi_execute_command (char *cmd, int from_tty)
|
|
|
|
{
|
|
|
|
struct mi_parse *command;
|
2002-05-20 20:09:57 +02:00
|
|
|
struct captured_mi_execute_command_args args;
|
|
|
|
struct ui_out *saved_uiout = uiout;
|
2000-02-23 01:25:43 +01:00
|
|
|
|
|
|
|
/* This is to handle EOF (^D). We just quit gdb. */
|
|
|
|
/* FIXME: we should call some API function here. */
|
|
|
|
if (cmd == 0)
|
|
|
|
quit_force (NULL, from_tty);
|
|
|
|
|
|
|
|
command = mi_parse (cmd);
|
|
|
|
|
|
|
|
if (command != NULL)
|
|
|
|
{
|
2005-01-13 19:15:02 +01:00
|
|
|
struct exception result;
|
2002-05-20 20:09:57 +02:00
|
|
|
/* FIXME: cagney/1999-11-04: Can this use of catch_exceptions either
|
2000-02-23 01:25:43 +01:00
|
|
|
be pushed even further down or even eliminated? */
|
2002-05-20 20:09:57 +02:00
|
|
|
args.command = command;
|
2005-01-13 19:15:02 +01:00
|
|
|
result = catch_exception (uiout, captured_mi_execute_command, &args,
|
|
|
|
RETURN_MASK_ALL);
|
2005-01-14 23:59:36 +01:00
|
|
|
exception_print (gdb_stderr, result);
|
2002-05-20 20:09:57 +02:00
|
|
|
|
|
|
|
if (args.action == EXECUTE_COMMAND_SUPRESS_PROMPT)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
/* The command is executing synchronously. Bail out early
|
|
|
|
suppressing the finished prompt. */
|
|
|
|
mi_parse_free (command);
|
|
|
|
return;
|
|
|
|
}
|
2005-01-13 23:08:27 +01:00
|
|
|
if (result.reason < 0)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
/* The command execution failed and error() was called
|
|
|
|
somewhere */
|
|
|
|
fputs_unfiltered (command->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^error,msg=\"", raw_stdout);
|
2005-01-14 03:33:24 +01:00
|
|
|
fputstr_unfiltered (result.message, '"', raw_stdout);
|
2000-02-23 01:25:43 +01:00
|
|
|
fputs_unfiltered ("\"\n", raw_stdout);
|
|
|
|
}
|
|
|
|
mi_parse_free (command);
|
|
|
|
}
|
|
|
|
|
|
|
|
fputs_unfiltered ("(gdb) \n", raw_stdout);
|
2001-07-12 07:54:48 +02:00
|
|
|
gdb_flush (raw_stdout);
|
2000-02-23 01:25:43 +01:00
|
|
|
/* print any buffered hook code */
|
|
|
|
/* ..... */
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum mi_cmd_result
|
|
|
|
mi_cmd_execute (struct mi_parse *parse)
|
|
|
|
{
|
|
|
|
if (parse->cmd->argv_func != NULL
|
|
|
|
|| parse->cmd->args_func != NULL)
|
|
|
|
{
|
|
|
|
/* FIXME: We need to save the token because the command executed
|
|
|
|
may be asynchronous and need to print the token again.
|
|
|
|
In the future we can pass the token down to the func
|
|
|
|
and get rid of the last_async_command */
|
|
|
|
/* The problem here is to keep the token around when we launch
|
|
|
|
the target, and we want to interrupt it later on. The
|
|
|
|
interrupt command will have its own token, but when the
|
|
|
|
target stops, we must display the token corresponding to the
|
|
|
|
last execution command given. So we have another string where
|
|
|
|
we copy the token (previous_async_command), if this was
|
|
|
|
indeed the token of an execution command, and when we stop we
|
|
|
|
print that one. This is possible because the interrupt
|
|
|
|
command, when over, will copy that token back into the
|
|
|
|
default token string (last_async_command). */
|
|
|
|
|
|
|
|
if (target_executing)
|
|
|
|
{
|
|
|
|
if (!previous_async_command)
|
|
|
|
previous_async_command = xstrdup (last_async_command);
|
|
|
|
if (strcmp (parse->command, "exec-interrupt"))
|
|
|
|
{
|
|
|
|
fputs_unfiltered (parse->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^error,msg=\"", raw_stdout);
|
|
|
|
fputs_unfiltered ("Cannot execute command ", raw_stdout);
|
|
|
|
fputstr_unfiltered (parse->command, '"', raw_stdout);
|
|
|
|
fputs_unfiltered (" while target running", raw_stdout);
|
|
|
|
fputs_unfiltered ("\"\n", raw_stdout);
|
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
last_async_command = xstrdup (parse->token);
|
2000-05-16 06:57:49 +02:00
|
|
|
make_exec_cleanup (free_current_contents, &last_async_command);
|
2000-02-23 01:25:43 +01:00
|
|
|
/* FIXME: DELETE THIS! */
|
|
|
|
if (parse->cmd->args_func != NULL)
|
|
|
|
return parse->cmd->args_func (parse->args, 0 /*from_tty */ );
|
|
|
|
return parse->cmd->argv_func (parse->command, parse->argv, parse->argc);
|
|
|
|
}
|
2003-08-05 01:18:50 +02:00
|
|
|
else if (parse->cmd->cli.cmd != 0)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
/* FIXME: DELETE THIS. */
|
|
|
|
/* The operation is still implemented by a cli command */
|
|
|
|
/* Must be a synchronous one */
|
2003-08-05 01:18:50 +02:00
|
|
|
mi_execute_cli_command (parse->cmd->cli.cmd, parse->cmd->cli.args_p,
|
|
|
|
parse->args);
|
2000-02-23 01:25:43 +01:00
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME: DELETE THIS. */
|
|
|
|
fputs_unfiltered (parse->token, raw_stdout);
|
|
|
|
fputs_unfiltered ("^error,msg=\"", raw_stdout);
|
|
|
|
fputs_unfiltered ("Undefined mi command: ", raw_stdout);
|
|
|
|
fputstr_unfiltered (parse->command, '"', raw_stdout);
|
|
|
|
fputs_unfiltered (" (missing implementation)", raw_stdout);
|
|
|
|
fputs_unfiltered ("\"\n", raw_stdout);
|
|
|
|
return MI_CMD_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: This is just a hack so we can get some extra commands going.
|
|
|
|
We don't want to channel things through the CLI, but call libgdb directly */
|
|
|
|
/* Use only for synchronous commands */
|
|
|
|
|
|
|
|
void
|
2003-08-05 01:18:50 +02:00
|
|
|
mi_execute_cli_command (const char *cmd, int args_p, const char *args)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2003-08-05 01:18:50 +02:00
|
|
|
if (cmd != 0)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
char *run;
|
2003-08-05 01:18:50 +02:00
|
|
|
if (args_p)
|
2004-06-01 15:33:58 +02:00
|
|
|
run = xstrprintf ("%s %s", cmd, args);
|
2003-08-05 01:18:50 +02:00
|
|
|
else
|
|
|
|
run = xstrdup (cmd);
|
2000-02-23 01:25:43 +01:00
|
|
|
if (mi_debug_p)
|
|
|
|
/* FIXME: gdb_???? */
|
|
|
|
fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n",
|
2003-08-05 01:18:50 +02:00
|
|
|
cmd, run);
|
2000-12-15 02:01:51 +01:00
|
|
|
old_cleanups = make_cleanup (xfree, run);
|
2000-02-23 01:25:43 +01:00
|
|
|
execute_command ( /*ui */ run, 0 /*from_tty */ );
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
enum mi_cmd_result
|
|
|
|
mi_execute_async_cli_command (char *mi, char *args, int from_tty)
|
|
|
|
{
|
|
|
|
struct cleanup *old_cleanups;
|
|
|
|
char *run;
|
|
|
|
char *async_args;
|
|
|
|
|
|
|
|
if (target_can_async_p ())
|
|
|
|
{
|
|
|
|
async_args = (char *) xmalloc (strlen (args) + 2);
|
|
|
|
make_exec_cleanup (free, async_args);
|
|
|
|
strcpy (async_args, args);
|
|
|
|
strcat (async_args, "&");
|
2004-06-01 15:33:58 +02:00
|
|
|
run = xstrprintf ("%s %s", mi, async_args);
|
2000-02-23 01:25:43 +01:00
|
|
|
make_exec_cleanup (free, run);
|
|
|
|
add_continuation (mi_exec_async_cli_cmd_continuation, NULL);
|
2001-05-10 22:31:46 +02:00
|
|
|
old_cleanups = NULL;
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-06-01 15:33:58 +02:00
|
|
|
run = xstrprintf ("%s %s", mi, args);
|
2000-12-15 02:01:51 +01:00
|
|
|
old_cleanups = make_cleanup (xfree, run);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!target_can_async_p ())
|
|
|
|
{
|
|
|
|
/* NOTE: For synchronous targets asynchronous behavour is faked by
|
|
|
|
printing out the GDB prompt before we even try to execute the
|
|
|
|
command. */
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("^running\n", raw_stdout);
|
|
|
|
fputs_unfiltered ("(gdb) \n", raw_stdout);
|
2001-07-12 07:54:48 +02:00
|
|
|
gdb_flush (raw_stdout);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME: cagney/1999-11-29: Printing this message before
|
|
|
|
calling execute_command is wrong. It should only be printed
|
|
|
|
once gdb has confirmed that it really has managed to send a
|
|
|
|
run command to the target. */
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("^running\n", raw_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
execute_command ( /*ui */ run, 0 /*from_tty */ );
|
|
|
|
|
|
|
|
if (!target_can_async_p ())
|
|
|
|
{
|
|
|
|
/* Do this before doing any printing. It would appear that some
|
|
|
|
print code leaves garbage around in the buffer. */
|
|
|
|
do_cleanups (old_cleanups);
|
|
|
|
/* If the target was doing the operation synchronously we fake
|
|
|
|
the stopped message. */
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("*stopped", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
mi_out_rewind (uiout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
return MI_CMD_QUIET;
|
|
|
|
}
|
|
|
|
return MI_CMD_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
mi_exec_async_cli_cmd_continuation (struct continuation_arg *arg)
|
|
|
|
{
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("*stopped", raw_stdout);
|
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
fputs_unfiltered ("(gdb) \n", raw_stdout);
|
2001-07-12 07:54:48 +02:00
|
|
|
gdb_flush (raw_stdout);
|
2000-02-23 01:25:43 +01:00
|
|
|
do_exec_cleanups (ALL_CLEANUPS);
|
|
|
|
}
|
|
|
|
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
void
|
2000-02-23 01:25:43 +01:00
|
|
|
mi_load_progress (const char *section_name,
|
|
|
|
unsigned long sent_so_far,
|
|
|
|
unsigned long total_section,
|
|
|
|
unsigned long total_sent,
|
|
|
|
unsigned long grand_total)
|
|
|
|
{
|
|
|
|
struct timeval time_now, delta, update_threshold;
|
|
|
|
static struct timeval last_update;
|
|
|
|
static char *previous_sect_name = NULL;
|
|
|
|
int new_section;
|
|
|
|
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
if (!current_interp_named_p (INTERP_MI)
|
|
|
|
&& !current_interp_named_p (INTERP_MI1))
|
2000-02-23 01:25:43 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
update_threshold.tv_sec = 0;
|
|
|
|
update_threshold.tv_usec = 500000;
|
|
|
|
gettimeofday (&time_now, NULL);
|
|
|
|
|
|
|
|
delta.tv_usec = time_now.tv_usec - last_update.tv_usec;
|
|
|
|
delta.tv_sec = time_now.tv_sec - last_update.tv_sec;
|
|
|
|
|
|
|
|
if (delta.tv_usec < 0)
|
|
|
|
{
|
|
|
|
delta.tv_sec -= 1;
|
|
|
|
delta.tv_usec += 1000000;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_section = (previous_sect_name ?
|
|
|
|
strcmp (previous_sect_name, section_name) : 1);
|
|
|
|
if (new_section)
|
|
|
|
{
|
2002-10-23 23:17:51 +02:00
|
|
|
struct cleanup *cleanup_tuple;
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (previous_sect_name);
|
2000-02-23 01:25:43 +01:00
|
|
|
previous_sect_name = xstrdup (section_name);
|
|
|
|
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("+download", raw_stdout);
|
2002-10-23 23:17:51 +02:00
|
|
|
cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2000-02-23 01:25:43 +01:00
|
|
|
ui_out_field_string (uiout, "section", section_name);
|
|
|
|
ui_out_field_int (uiout, "section-size", total_section);
|
|
|
|
ui_out_field_int (uiout, "total-size", grand_total);
|
2002-10-23 23:17:51 +02:00
|
|
|
do_cleanups (cleanup_tuple);
|
2000-02-23 01:25:43 +01:00
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
gdb_flush (raw_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (delta.tv_sec >= update_threshold.tv_sec &&
|
|
|
|
delta.tv_usec >= update_threshold.tv_usec)
|
|
|
|
{
|
2002-10-23 23:17:51 +02:00
|
|
|
struct cleanup *cleanup_tuple;
|
2000-02-23 01:25:43 +01:00
|
|
|
last_update.tv_sec = time_now.tv_sec;
|
|
|
|
last_update.tv_usec = time_now.tv_usec;
|
|
|
|
if (last_async_command)
|
|
|
|
fputs_unfiltered (last_async_command, raw_stdout);
|
|
|
|
fputs_unfiltered ("+download", raw_stdout);
|
2002-10-23 23:17:51 +02:00
|
|
|
cleanup_tuple = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2000-02-23 01:25:43 +01:00
|
|
|
ui_out_field_string (uiout, "section", section_name);
|
|
|
|
ui_out_field_int (uiout, "section-sent", sent_so_far);
|
|
|
|
ui_out_field_int (uiout, "section-size", total_section);
|
|
|
|
ui_out_field_int (uiout, "total-sent", total_sent);
|
|
|
|
ui_out_field_int (uiout, "total-size", grand_total);
|
2002-10-23 23:17:51 +02:00
|
|
|
do_cleanups (cleanup_tuple);
|
2000-02-23 01:25:43 +01:00
|
|
|
mi_out_put (uiout, raw_stdout);
|
|
|
|
fputs_unfiltered ("\n", raw_stdout);
|
|
|
|
gdb_flush (raw_stdout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-02-05 Jim Ingham <jingham@apple.com>
Keith Seitz <keiths@redhat.com>
Elena Zannoni <ezannoni@redhat.com>
Andrew Cagney <ac131313@redhat.com>
* Makefile.in (SUBDIR_CLI_OBS): Add "cli-interp.o".
(SUBDIR_CLI_SRCS): Add "cli/cli-interp.c".
(SUBDIR_MI_OBS): Add "mi-interp.o".
(SUBDIR_MI_SRCS): Add "mi/mi-interp.c".
(SFILES): Add "interps.c".
(COMMON_OBS): Add "interps.o".
(interps_h, mi_main_h): Define.
(interps.o, cli-interp.o, mi-interp.o): Add dependencies.
(mi-main.o, main.o, event-top.o): Update dependencies.
* cli/cli-interp.c: New file.
* interps.h, interps.c: New files.
* top.c: (gdb_init): Don't install the default interpreter, handed
by captured_main.
* main.c: Include "interps.h".
(interpreter_p): Note that it should malloc'ed.
(captured_command_loop): Call current_interp_command_loop.
(captured_main): Initialize interpreter_p to INTERP_CONSOLE. Use
xfree and xstrdup when updating interpreter_p. Install the
default interpreter. Add hack to stop mi1's copyright notice
being encoded.
* event-top.h (gdb_setup_readline): Declare.
(gdb_disable_readline): Declare.
* event-top.c: Include "interps.h".
(display_gdb_prompt): Call current_interp_display_prompt_p.
(gdb_setup_readline): Initialize gdb_stdout, gdb_stderr,
gdb_stdlog, and gdb_stdtarg.
(_initialize_event_loop): Don't call gdb_setup_readline.
* cli-out.c (cli_out_set_stream): New function.
* cli-out.h (cli_out_set_stream): Declare.
2003-02-06 02:19:12 +01:00
|
|
|
void
|
|
|
|
mi_setup_architecture_data (void)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2003-09-11 04:34:00 +02:00
|
|
|
old_regs = xmalloc ((NUM_REGS + NUM_PSEUDO_REGS) * MAX_REGISTER_SIZE + 1);
|
|
|
|
memset (old_regs, 0, (NUM_REGS + NUM_PSEUDO_REGS) * MAX_REGISTER_SIZE + 1);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
_initialize_mi_main (void)
|
2000-02-23 01:25:43 +01:00
|
|
|
{
|
2004-02-15 16:22:06 +01:00
|
|
|
DEPRECATED_REGISTER_GDBARCH_SWAP (old_regs);
|
|
|
|
deprecated_register_gdbarch_swap (NULL, 0, mi_setup_architecture_data);
|
2000-02-23 01:25:43 +01:00
|
|
|
}
|