darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove ARI problems:

Browse source 
* ada-exp.y (write_var_from_sym): Reformat to put operator at
beginning of line.

* ada-lang.c (MAX_OF_SIZE): Rename max_of_size.
Add comment.
Add comment concerning MAX_OF_TYPE and MIN_OF_TYPE.
(MIN_OF_SIZE): Rename min_of_size.  Add comment.
(UMAX_OF_SIZE): Renmae umax_of_size.  Add comment.
(UMIN_OF_SIZE): Remove.
(max_of_type): New function to replace orphan macro in gdbtypes.h
(min_of_type): Ditto.
(discrete_type_high_bound): Use max_of_type.
(discrete_type_low_bound): Use min_of_type.
(possible_user_operator_p): Move operator to beginning of line.
(ada_is_variant_part): Ditto.
(ensure_lval): Rewrite to avoid deprecated operations.
(ada_finish_decode_line_1): Use gdbarch_convert_from_func_ptr_addr
rather than adding DEPRECATED_FUNCTION_START_OFFSET.
(ada_enum_name): Remove assignments in 'if' statements.
(build_ada_types): Add gdbarch parameter.
(_initialize_ada_language): Replace deprecated_register_gdbarch_swap
with gdbarch_data_register_post_init.
Use add_setshow_uinteger_cmd rather than add_set_cmd and
add_show_from_set.

* ada-valprint.c (inspect_it): Remove declaration.
(repeat_count_threshold): Remove declaration.
(ada_print_floating): Remove assignments in 'if' statements.
(print_str): Move operator to beginning of line.
This commit is contained in:
Paul N. Hilfinger 2004-07-09 19:29:56 +00:00
parent e525914fa7
commit c3e5cd34c6
4 changed files with 142 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gdb/ChangeLog
View file

@ -1,3 +1,37 @@
2004-07-09 Paul N. Hilfinger <Hilfinger@gnat.com>
Remove ARI problems:
* ada-exp.y (write_var_from_sym): Reformat to put operator at
beginning of line.
* ada-lang.c (MAX_OF_SIZE): Rename max_of_size.
Add comment.
Add comment concerning MAX_OF_TYPE and MIN_OF_TYPE.
(MIN_OF_SIZE): Rename min_of_size. Add comment.
(UMAX_OF_SIZE): Renmae umax_of_size. Add comment.
(UMIN_OF_SIZE): Remove.
(max_of_type): New function to replace orphan macro in gdbtypes.h
(min_of_type): Ditto.
(discrete_type_high_bound): Use max_of_type.
(discrete_type_low_bound): Use min_of_type.
(possible_user_operator_p): Move operator to beginning of line.
(ada_is_variant_part): Ditto.
(ensure_lval): Rewrite to avoid deprecated operations.
(ada_finish_decode_line_1): Use gdbarch_convert_from_func_ptr_addr
rather than adding DEPRECATED_FUNCTION_START_OFFSET.
(ada_enum_name): Remove assignments in 'if' statements.
(build_ada_types): Add gdbarch parameter.
(_initialize_ada_language): Replace deprecated_register_gdbarch_swap
with gdbarch_data_register_post_init.
Use add_setshow_uinteger_cmd rather than add_set_cmd and
add_show_from_set.
* ada-valprint.c (inspect_it): Remove declaration.
(repeat_count_threshold): Remove declaration.
(ada_print_floating): Remove assignments in 'if' statements.
(print_str): Move operator to beginning of line.
2004-07-08 Jim Blandy <jimb@redhat.com> 2004-07-08 Jim Blandy <jimb@redhat.com>
* rs6000-tdep.c (registers_powerpc_nofp): Unused; deleted. * rs6000-tdep.c (registers_powerpc_nofp): Unused; deleted.

4
gdb/ada-exp.y
View file

@ -644,8 +644,8 @@ write_var_from_sym (struct block *orig_left_context,
{ {
if (orig_left_context == NULL && symbol_read_needs_frame (sym)) if (orig_left_context == NULL && symbol_read_needs_frame (sym))
{ {
if (innermost_block == 0 || if (innermost_block == 0
contained_in (block, innermost_block)) || contained_in (block, innermost_block))
innermost_block = block; innermost_block = block;
} }

120
gdb/ada-lang.c
View file

@ -623,30 +623,51 @@ ada_translate_error_message (const char *string)
return string; return string;
} }
/* Note: would have used MAX_OF_TYPE and MIN_OF_TYPE macros from
gdbtypes.h, but some of the necessary definitions in that file
seem to have gone missing. */
/* Maximum value of a SIZE-byte signed integer type. */
static LONGEST static LONGEST
MAX_OF_SIZE (int size) max_of_size (int size)
{ {
LONGEST top_bit = (LONGEST) 1 << (size * 8 - 2); LONGEST top_bit = (LONGEST) 1 << (size * 8 - 2);
return top_bit | (top_bit - 1); return top_bit | (top_bit - 1);
} }
/* Minimum value of a SIZE-byte signed integer type. */
static LONGEST static LONGEST
MIN_OF_SIZE (int size) min_of_size (int size)
{ {
return -MAX_OF_SIZE (size) - 1; return -max_of_size (size) - 1;
} }
/* Maximum value of a SIZE-byte unsigned integer type. */
static ULONGEST static ULONGEST
UMAX_OF_SIZE (int size) umax_of_size (int size)
{ {
ULONGEST top_bit = (ULONGEST) 1 << (size * 8 - 1); ULONGEST top_bit = (ULONGEST) 1 << (size * 8 - 1);
return top_bit | (top_bit - 1); return top_bit | (top_bit - 1);
} }
static ULONGEST /* Maximum value of integral type T, as a signed quantity. */
UMIN_OF_SIZE (int size) static LONGEST
max_of_type (struct type *t)
{ {
return 0; if (TYPE_UNSIGNED (t))
return (LONGEST) umax_of_size (TYPE_LENGTH (t));
else
return max_of_size (TYPE_LENGTH (t));
}
/* Minimum value of integral type T, as a signed quantity. */
static LONGEST
min_of_type (struct type *t)
{
if (TYPE_UNSIGNED (t))
return 0;
else
return min_of_size (TYPE_LENGTH (t));
} }
/* The largest value in the domain of TYPE, a discrete type, as an integer. */ /* The largest value in the domain of TYPE, a discrete type, as an integer. */
@ -664,7 +685,7 @@ discrete_type_high_bound (struct type *type)
TYPE_FIELD_BITPOS (type, TYPE_FIELD_BITPOS (type,
TYPE_NFIELDS (type) - 1)); TYPE_NFIELDS (type) - 1));
case TYPE_CODE_INT: case TYPE_CODE_INT:
return value_from_longest (type, MAX_OF_TYPE (type)); return value_from_longest (type, max_of_type (type));
default: default:
error ("Unexpected type in discrete_type_high_bound."); error ("Unexpected type in discrete_type_high_bound.");
} }
@ -682,7 +703,7 @@ discrete_type_low_bound (struct type *type)
case TYPE_CODE_ENUM: case TYPE_CODE_ENUM:
return value_from_longest (type, TYPE_FIELD_BITPOS (type, 0)); return value_from_longest (type, TYPE_FIELD_BITPOS (type, 0));
case TYPE_CODE_INT: case TYPE_CODE_INT:
return value_from_longest (type, MIN_OF_TYPE (type)); return value_from_longest (type, min_of_type (type));
default: default:
error ("Unexpected type in discrete_type_low_bound."); error ("Unexpected type in discrete_type_low_bound.");
} }
@ -3444,8 +3465,8 @@ possible_user_operator_p (enum exp_opcode op, struct value *args[])
|| TYPE_CODE (TYPE_TARGET_TYPE (type0)) != TYPE_CODE_ARRAY)) || TYPE_CODE (TYPE_TARGET_TYPE (type0)) != TYPE_CODE_ARRAY))
|| (TYPE_CODE (type1) != TYPE_CODE_ARRAY || (TYPE_CODE (type1) != TYPE_CODE_ARRAY
&& (TYPE_CODE (type1) != TYPE_CODE_PTR && (TYPE_CODE (type1) != TYPE_CODE_PTR
|| (TYPE_CODE (TYPE_TARGET_TYPE (type1)) != || (TYPE_CODE (TYPE_TARGET_TYPE (type1))
TYPE_CODE_ARRAY)))); != TYPE_CODE_ARRAY))));
case BINOP_EXP: case BINOP_EXP:
return (!(numeric_type_p (type0) && integer_type_p (type1))); return (!(numeric_type_p (type0) && integer_type_p (type1)));
@ -3535,24 +3556,36 @@ ada_simple_renamed_entity (struct symbol *sym)
static struct value * static struct value *
ensure_lval (struct value *val, CORE_ADDR *sp) ensure_lval (struct value *val, CORE_ADDR *sp)
{ {
CORE_ADDR old_sp = *sp; if (! VALUE_LVAL (val))
{
int len = TYPE_LENGTH (check_typedef (VALUE_TYPE (val)));
if (VALUE_LVAL (val)) /* The following is taken from the structure-return code in
return val; call_function_by_hand. FIXME: Therefore, some refactoring seems
indicated. */
if (INNER_THAN (1, 2))
{
/* Stack grows downward. Align SP and VALUE_ADDRESS (val) after
reserving sufficient space. */
*sp -= len;
if (gdbarch_frame_align_p (current_gdbarch))
*sp = gdbarch_frame_align (current_gdbarch, *sp);
VALUE_ADDRESS (val) = *sp;
}
else
{
/* Stack grows upward. Align the frame, allocate space, and
then again, re-align the frame. */
if (gdbarch_frame_align_p (current_gdbarch))
*sp = gdbarch_frame_align (current_gdbarch, *sp);
VALUE_ADDRESS (val) = *sp;
*sp += len;
if (gdbarch_frame_align_p (current_gdbarch))
*sp = gdbarch_frame_align (current_gdbarch, *sp);
}
if (DEPRECATED_STACK_ALIGN_P ()) write_memory (VALUE_ADDRESS (val), VALUE_CONTENTS_RAW (val), len);
*sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val), }
DEPRECATED_STACK_ALIGN
(TYPE_LENGTH (check_typedef (VALUE_TYPE (val)))));
else
*sp = push_bytes (*sp, VALUE_CONTENTS_RAW (val),
TYPE_LENGTH (check_typedef (VALUE_TYPE (val))));
VALUE_LVAL (val) = lval_memory;
if (INNER_THAN (1, 2))
VALUE_ADDRESS (val) = *sp;
else
VALUE_ADDRESS (val) = old_sp;
return val; return val;
} }
@ -5620,7 +5653,9 @@ ada_finish_decode_line_1 (char **spec, struct symtab *file_table,
val.section = SYMBOL_BFD_SECTION (msymbol); val.section = SYMBOL_BFD_SECTION (msymbol);
if (funfirstline) if (funfirstline)
{ {
val.pc += DEPRECATED_FUNCTION_START_OFFSET; val.pc = gdbarch_convert_from_func_ptr_addr (current_gdbarch,
val.pc,
&current_target);
SKIP_PROLOGUE (val.pc); SKIP_PROLOGUE (val.pc);
} }
selected.sals = (struct symtab_and_line *) selected.sals = (struct symtab_and_line *)
@ -6735,8 +6770,8 @@ ada_is_variant_part (struct type *type, int field_num)
struct type *field_type = TYPE_FIELD_TYPE (type, field_num); struct type *field_type = TYPE_FIELD_TYPE (type, field_num);
return (TYPE_CODE (field_type) == TYPE_CODE_UNION return (TYPE_CODE (field_type) == TYPE_CODE_UNION
|| (is_dynamic_field (type, field_num) || (is_dynamic_field (type, field_num)
&& TYPE_CODE (TYPE_TARGET_TYPE (field_type)) == && (TYPE_CODE (TYPE_TARGET_TYPE (field_type))
TYPE_CODE_UNION)); == TYPE_CODE_UNION)));
} }
/* Assuming that VAR_TYPE is a variant wrapper (type of the variant part) /* Assuming that VAR_TYPE is a variant wrapper (type of the variant part)
@ -8464,7 +8499,8 @@ ada_enum_name (const char *name)
but stop searching when we hit an overloading suffix, which is but stop searching when we hit an overloading suffix, which is
of the form "__" followed by digits. */ of the form "__" followed by digits. */
if ((tmp = strrchr (name, '.')) != NULL) tmp = strrchr (name, '.');
if (tmp != NULL)
name = tmp + 1; name = tmp + 1;
else else
{ {
@ -8500,8 +8536,10 @@ ada_enum_name (const char *name)
} }
else else
{ {
if ((tmp = strstr (name, "__")) != NULL tmp = strstr (name, "__");
|| (tmp = strstr (name, "$")) != NULL) if (tmp == NULL)
tmp = strstr (name, "$");
if (tmp != NULL)
{ {
GROW_VECT (result, result_len, tmp - name + 1); GROW_VECT (result, result_len, tmp - name + 1);
strncpy (result, name, tmp - name); strncpy (result, name, tmp - name);
@ -10169,7 +10207,7 @@ const struct language_defn ada_language_defn = {
}; };
static void static void
build_ada_types (void) build_ada_types (struct gdbarch *current_gdbarch)
{ {
builtin_type_ada_int = builtin_type_ada_int =
init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT, init_type (TYPE_CODE_INT, TARGET_INT_BIT / TARGET_CHAR_BIT,
@ -10213,17 +10251,17 @@ void
_initialize_ada_language (void) _initialize_ada_language (void)
{ {
build_ada_types (); build_ada_types (current_gdbarch);
deprecated_register_gdbarch_swap (NULL, 0, build_ada_types); gdbarch_data_register_post_init (build_ada_types);
add_language (&ada_language_defn); add_language (&ada_language_defn);
varsize_limit = 65536; varsize_limit = 65536;
#ifdef GNAT_GDB #ifdef GNAT_GDB
add_show_from_set add_setshow_uinteger_cmd ("varsize-limit", class_support,
(add_set_cmd ("varsize-limit", class_support, var_uinteger, &varsize_limit, "\
(char *) &varsize_limit, Set the maximum number of bytes allowed in a dynamic-sized object.", "\
"Set maximum bytes in dynamic-sized object.", Show the maximum number of bytes allowed in a dynamic-sized object.",
&setlist), &showlist); NULL, NULL, &setlist, &showlist);
obstack_init (&cache_space); obstack_init (&cache_space);
#endif /* GNAT_GDB */ #endif /* GNAT_GDB */

44
gdb/ada-valprint.c
View file

@ -48,9 +48,6 @@ struct ada_val_print_args
enum val_prettyprint pretty; enum val_prettyprint pretty;
}; };
extern int inspect_it;
extern unsigned int repeat_count_threshold;
static void print_record (struct type *, char *, struct ui_file *, int, static void print_record (struct type *, char *, struct ui_file *, int,
int, enum val_prettyprint); int, enum val_prettyprint);
@ -317,21 +314,34 @@ ada_print_floating (char *valaddr, struct type *type, struct ui_file *stream)
len = strlen (result); len = strlen (result);
/* Modify for Ada rules. */ /* Modify for Ada rules. */
if ((s = strstr (result, "inf")) != NULL
|| (s = strstr (result, "Inf")) != NULL s = strstr (result, "inf");
|| (s = strstr (result, "INF")) != NULL) if (s == NULL)
s = strstr (result, "Inf");
if (s == NULL)
s = strstr (result, "INF");
if (s != NULL)
strcpy (s, "Inf"); strcpy (s, "Inf");
else if ((s = strstr (result, "nan")) != NULL
|| (s = strstr (result, "NaN")) != NULL if (s == NULL)
|| (s = strstr (result, "Nan")) != NULL)
{ {
s[0] = s[2] = 'N'; s = strstr (result, "nan");
if (result[0] == '-') if (s == NULL)
result += 1; s = strstr (result, "NaN");
if (s == NULL)
s = strstr (result, "Nan");
if (s != NULL)
{
s[0] = s[2] = 'N';
if (result[0] == '-')
result += 1;
}
} }
else if (strchr (result, '.') == NULL)
if (s == NULL && strchr (result, '.') == NULL)
{ {
if ((s = strchr (result, 'e')) == NULL) s = strchr (result, 'e');
if (s == NULL)
fprintf_filtered (stream, "%s.0", result); fprintf_filtered (stream, "%s.0", result);
else else
fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s); fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s);
@ -460,9 +470,9 @@ printstr (struct ui_file *stream, char *string, unsigned int length,
rep1 = i + 1; rep1 = i + 1;
reps = 1; reps = 1;
while (rep1 < length && while (rep1 < length
char_at (string, rep1, type_len) == char_at (string, i, && char_at (string, rep1, type_len) == char_at (string, i,
type_len)) type_len))
{ {
rep1 += 1; rep1 += 1;
reps += 1; reps += 1;