#include "block.h"
#include "stack.h"
#include "gdb_assert.h"
+#include "dictionary.h"
+#include "reggroups.h"
/* Prototypes for exported functions. */
{
struct block *b = NULL;
int first = 1;
- register int i;
- register struct symbol *sym;
+ struct dict_iterator iter;
+ struct symbol *sym;
struct value *val;
/* Offset of next stack argument beyond the one we have seen that is
at the highest offset.
if (func)
{
b = SYMBOL_BLOCK_VALUE (func);
- /* Function blocks are order sensitive, and thus should not be
- hashed. */
- gdb_assert (BLOCK_HASHTABLE (b) == 0);
- ALL_BLOCK_SYMBOLS (b, i, sym)
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
{
QUIT;
struct symtab_and_line sal)
{
struct symbol *func;
- register char *funname = 0;
+ char *funname = 0;
enum language funlang = language_unknown;
struct ui_stream *stb;
struct cleanup *old_chain;
stb = ui_out_stream_new (uiout);
old_chain = make_cleanup_ui_out_stream_delete (stb);
- func = find_pc_function (frame_address_in_block (fi));
+ func = find_pc_function (get_frame_address_in_block (fi));
if (func)
{
/* In certain pathological cases, the symtabs give the wrong
ever changed many parts of GDB will need to be changed (and we'll
create a find_pc_minimal_function or some such). */
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi));
if (msymbol != NULL
&& (SYMBOL_VALUE_ADDRESS (msymbol)
> BLOCK_START (SYMBOL_BLOCK_VALUE (func))))
}
else
{
- struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (frame_address_in_block (fi));
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_address_in_block (fi));
if (msymbol != NULL)
{
funname = DEPRECATED_SYMBOL_NAME (msymbol);
}
else
{
- register struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
+ struct minimal_symbol *msymbol = lookup_minimal_symbol_by_pc (get_frame_pc (fi));
if (msymbol != NULL)
{
funname = DEPRECATED_SYMBOL_NAME (msymbol);
}
if (DEPRECATED_FRAME_INIT_SAVED_REGS_P ()
- && get_frame_saved_regs (fi) == NULL)
+ && deprecated_get_frame_saved_regs (fi) == NULL)
DEPRECATED_FRAME_INIT_SAVED_REGS (fi);
/* Print as much information as possible on the location of all the
registers. */
count = 0;
numregs = NUM_REGS + NUM_PSEUDO_REGS;
for (i = 0; i < numregs; i++)
- if (i != SP_REGNUM)
+ if (i != SP_REGNUM
+ && gdbarch_register_reggroup_p (current_gdbarch, i, all_reggroup))
{
/* Find out the location of the saved register without
fetching the corresponding value. */
backtrace_command_1 (char *count_exp, int show_locals, int from_tty)
{
struct frame_info *fi;
- register int count;
- register int i;
- register struct frame_info *trailing;
- register int trailing_level;
+ int count;
+ int i;
+ struct frame_info *trailing;
+ int trailing_level;
if (!target_has_stack)
error ("No stack.");
fi = get_prev_frame (fi))
{
QUIT;
- ps = find_pc_psymtab (frame_address_in_block (fi));
+ ps = find_pc_psymtab (get_frame_address_in_block (fi));
if (ps)
PSYMTAB_TO_SYMTAB (ps); /* Force syms to come in */
}
Return 1 if any variables were printed; 0 otherwise. */
static int
-print_block_frame_locals (struct block *b, register struct frame_info *fi,
- int num_tabs, register struct ui_file *stream)
+print_block_frame_locals (struct block *b, struct frame_info *fi,
+ int num_tabs, struct ui_file *stream)
{
- register int i, j;
- register struct symbol *sym;
- register int values_printed = 0;
+ struct dict_iterator iter;
+ int j;
+ struct symbol *sym;
+ int values_printed = 0;
- ALL_BLOCK_SYMBOLS (b, i, sym)
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
{
switch (SYMBOL_CLASS (sym))
{
static int
print_block_frame_labels (struct block *b, int *have_default,
- register struct ui_file *stream)
+ struct ui_file *stream)
{
- register int i;
- register struct symbol *sym;
- register int values_printed = 0;
+ struct dict_iterator iter;
+ struct symbol *sym;
+ int values_printed = 0;
- ALL_BLOCK_SYMBOLS (b, i, sym)
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
{
if (STREQ (DEPRECATED_SYMBOL_NAME (sym), "default"))
{
on the function running in FRAME. */
static void
-print_frame_local_vars (register struct frame_info *fi, register int num_tabs,
- register struct ui_file *stream)
+print_frame_local_vars (struct frame_info *fi, int num_tabs,
+ struct ui_file *stream)
{
- register struct block *block = get_frame_block (fi, 0);
- register int values_printed = 0;
+ struct block *block = get_frame_block (fi, 0);
+ int values_printed = 0;
if (block == 0)
{
/* Same, but print labels. */
static void
-print_frame_label_vars (register struct frame_info *fi, int this_level_only,
- register struct ui_file *stream)
+print_frame_label_vars (struct frame_info *fi, int this_level_only,
+ struct ui_file *stream)
{
- register struct blockvector *bl;
- register struct block *block = get_frame_block (fi, 0);
- register int values_printed = 0;
+ struct blockvector *bl;
+ struct block *block = get_frame_block (fi, 0);
+ int values_printed = 0;
int index, have_default = 0;
char *blocks_printed;
CORE_ADDR pc = get_frame_pc (fi);
}
}
-/* ARGSUSED */
void
locals_info (char *args, int from_tty)
{
}
static void
-print_frame_arg_vars (register struct frame_info *fi,
- register struct ui_file *stream)
+print_frame_arg_vars (struct frame_info *fi,
+ struct ui_file *stream)
{
struct symbol *func = get_frame_function (fi);
- register struct block *b;
- register int i;
- register struct symbol *sym, *sym2;
- register int values_printed = 0;
+ struct block *b;
+ struct dict_iterator iter;
+ struct symbol *sym, *sym2;
+ int values_printed = 0;
if (func == 0)
{
}
b = SYMBOL_BLOCK_VALUE (func);
- ALL_BLOCK_SYMBOLS (b, i, sym)
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
{
switch (SYMBOL_CLASS (sym))
{
how much farther the original request asked to go. */
struct frame_info *
-find_relative_frame (register struct frame_info *frame,
- register int *level_offset_ptr)
+find_relative_frame (struct frame_info *frame,
+ int *level_offset_ptr)
{
- register struct frame_info *prev;
- register struct frame_info *frame1;
+ struct frame_info *prev;
+ struct frame_info *frame1;
/* Going up is simple: just do get_prev_frame enough times
or until initial frame is reached. */
/* Select the frame up one or COUNT stack levels
from the previously selected frame, and print it briefly. */
-/* ARGSUSED */
static void
up_silently_base (char *count_exp)
{
- register struct frame_info *fi;
+ struct frame_info *fi;
int count = 1, count1;
if (count_exp)
count = parse_and_eval_long (count_exp);
/* Select the frame down one or COUNT stack levels
from the previously selected frame, and print it briefly. */
-/* ARGSUSED */
static void
down_silently_base (char *count_exp)
{
- register struct frame_info *frame;
+ struct frame_info *frame;
int count = -1, count1;
if (count_exp)
count = -parse_and_eval_long (count_exp);
selected_frame_level_changed_event (frame_relative_level (deprecated_selected_frame));
}
-/* ARGSUSED */
static void
down_silently_command (char *count_exp, int from_tty)
{
enum language
get_frame_language (void)
{
- register struct symtab *s;
+ struct symtab *s;
enum language flang; /* The language of the current frame */
if (deprecated_selected_frame)