http://sourceware.org/ml/gdb-patches/2012-09/msg00631.html

Subject: [PATCH 1/4] Expand bitpos and type.length to LONGEST and ULONGEST

--MP_/yp5f+W_ED2JtUlSyBi8xujr

Content-Type: text/plain; charset=US-ASCII

Content-Transfer-Encoding: 7bit

Content-Disposition: inline

Hi,

This is patch 1/4, which implements the bulk of the changes in type

length and bitpos/type offset. I have verified that there are no

regressions resulting from this patch by running the testsuite on

Fedora 16 x86_64.  Patch and changelog attached.

Regards,

Siddhesh

--MP_/yp5f+W_ED2JtUlSyBi8xujr

Content-Type: text/plain

Content-Transfer-Encoding: quoted-printable

Content-Disposition: attachment; filename=ChangeLog-main

gdb/ChangeLog

2012-08-05  Siddhesh Poyarekar  <siddhesh@redhat.com>

	* ada-lang.c (fat_pntr_bounds_bitpos): Return LONGEST.

	(fat_pntr_data_bitpos): Likewise.

	(desc_bound_bitpos): Likewise.

	(constrained_packed_array_type): Expand ELT_BITS parameter to

	LONGEST.

	(move_bits): Expand parameters SRC_OFFSET and N to LONGEST.

	(cond_offset_host): Expand parameter OFFSET to LONGEST.

	(cond_offset_target): Likewise.

	(ada_type_of_array): Expand ARRAY_BITSIZE to LONGEST.

	(decode_constrained_packed_array_type): Expand BITS to LONGEST.

	(decode_constrained_packed_array): Expand BIT_POS to LONGEST.

	(ada_value_primitive_packed_val): Expand parameter OFFSET to

	LONGEST.  Expand TARG, NTARG and NEW_OFFSET to LONGEST.

	(ada_value_assign): Expand FROM_SIZE to LONGEST.

	(value_assign_to_component): Expand BITS to LONGEST.

	(ensure_lval): Expand LEN to LONGEST.

	(value_pointer): Expand LEN to ULONGEST.

	(value_tag_from_contents_and_address): Expand TAG_BYTE_OFFSET to

	LONGEST.

	(ada_value_primitive_field): Expand parameter OFFSET to LONGEST.

	Expand bit_pos to LONGEST.

	(find_struct_field): Expand parameters OFFSET and BYTE_OFFSET_P to

	LONGEST.  Expand BIT_POS and FLD_OFFSET to LONGEST.

	(ada_search_struct_field): Expand parameter OFFSET to LONGEST.

	Expand VAR_OFFSET to LONGEST.

	(ada_index_struct_field): Expand parameters INDEX and OFFSET to

	LONGEST.

	(ada_index_struct_field_1): Expand parameters INDEX_P and OFFSET

	to LONGEST.

	(ada_value_struct_elt): Expand BYTE_OFFSET to LONGEST.

	(align_value): Return ULONGEST.  Expand parameter OFF and

	ALIGNMENT to ULONGEST.

	(ada_template_to_fixed_record_type_1): Expand OFF, BIT_LEN and

	fld_bit_len to LONGEST.  Expand FIELD_OFFSET to LONGEST.  Use

	pulongest function to print TYPE_LENGTH.

	(to_fixed_array_type): Expand LEN to LONGEST.

	* ada-lang.h (ada_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(ada_printstr): Expand parameter LENGTH to ULONGEST.

	(ada_value_primitive_packed_val): Expand parameter OFFSET to

	LONGEST.

	* ada-typeprint.c (ada_print_type): Use pulongest to print

	TYPE_LENGTH.

	* ada-valprint.c (val_print_packed_array_elements): Expand ELTLEN

	to ULONGEST.

	(char_at): Expand parameter I to LONGEST.

	(printstr): Expand parameter LENGTH, I, REP1, REPS to ULONGEST.

	Use pulongest to format print REPS.

	(ada_printstr): Expand parameter LENGTH to LONGEST.

	(ada_val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	(ada_val_print_array): Expand ELTLEN, LEN to ULONGEST and TEMP_LEN

	to LONGEST.

	(ada_val_print_1): Expand parameter OFFSET to LONGEST.

	(print_variant_part): Expand parameters OFFSET and OUTER_OFFSET to

	LONGEST.

	(print_field_values): Likewise.  Expand BIT_POS to LONGEST.

	* annotate.c (annotate_array_section_begin): Expand parameter

	IDX to LONGEST.  Use plongest to format-print IDX.

	(annotate_elt_rep): Expand parameter REPCOUNT to ULONGEST.  Use

	plongest to format-print REPCOUNT.

	* annotate.h: Likewise.

	* arm-linux-nat.c (arm_linux_region_ok_for_hw_watchpoint):

	Expand parameter parameter LEN to LONGEST.

	* ax-gdb.c (gen_left_shift): Expand parameter DISTANCE to LONGEST.

	(gen_offset): Expand parameter OFFSET to LONGEST.

	(gen_bitfield_ref): Expand parameters START, END to LONGEST.

	Expand BOUND_START, BOUND_END, OFFSET to LONGEST.

	(gen_primitive_field): Expand parameter OFFSET to LONGEST.

	(gen_struct_ref_recursive): Likewise.

	* ax-general.c (ax_trace_quick): Expand parameter N to LONGEST.

	* ax.h (ax_trace_quick): Likewise.

	* breakpoint.c (breakpoint_address_match_range): Expand parameter

	LEN1 to LONGEST.

	(can_use_hardware_watchpoint): Expand LEN to LONGEST.

	* breakpoint.h (struct bp_target_info): Expand member LENGTH to

	LONGEST.

	(struct bp_location): Likewise.

	* c-lang.c (c_printstr): Expand parameter LENGTH to ULONGEST.

	(evaluate_subexp_c): Expand ELEMENT_SIZE, I to LONGEST.

	* c-lang.h (c_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(c_printstr): Expand parameter LENGTH to ULONGEST.

	(cp_print_value_fields): Expand parameter OFFSET to LONGEST.

	(cp_print_value_fields_rtti): Likewise.

	* c-typeprint.c (c_type_print_varspec_suffix): Remove cast down to

	int and use plongest to print LONGEST.

	* c-valprint.c (c_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.  Expand OFFSET to LONGEST, ELTLEN to ULONGEST.

	(c_value_print): Expand TOP to LONGEST.

	* cp-abi.c (baseclass_offset): Return LONGEST.  Expand parameter

	EMBEDDED_OFFSET to LONGEST.  Expand RES to LONGEST.

	(value_virtual_fn_field): Expand parameter OFFSET to LONGEST.

	(value_rtti_type): Expand parameter TOP to point to LONGEST.

	* cp-abi.h (value_virtual_fn_field): Expand OFFSET to LONGEST.

	(value_rtti_type): Expand TOP to point to LONGEST.

	(baseclass_offset): Return LONGEST.  Expand parameter

	EMBEDDED_OFFSET to LONGEST.

	(struct cp_abi_ops): Expand parameter OFFSET for VIRTUAL_FN_FIELD

	to LONGEST.  Expand parameter TOP to point to LONGEST in

	VALUE_RTTI_TYPE.  Return LONGEST from BASECLASS_OFFSET and expand

	parameter EMBEDDED_OFFSET to LONGEST.

	* cp-valprint.c (cp_print_value_fields): Expand parameter OFFSET

	to LONGEST.  Expand I_OFFSET to LONGEST.

	(cp_print_value_fields_rtti): Expand parameter OFFSET to

	LONGEST.  Expand TOP to LONGEST.

	(cp_print_value): Expand parameter OFFSET to LONGEST.  Expand

	THISOFFSET, BOFFSET to LONGEST.

	* d-lang.h (d_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	* d-valprint.c (dynamic_array_type): Likewise.

	(d_val_print): Likewise.

	* doublest.c (floatformat_from_length): Expand parameter LEN to

	LONGEST.  Use plongest to format string for LONGEST.

	* dwarf2loc.c (copy_bitwise): Expand parameters DEST_OFFSET_BITS,

	BIT_COUNT to ULONGEST.  Rename parameter SOURCE_OFFSET_BITS to

	SOURCE_OFFSET and expand to ULONGEST.  New variable

	SOURCE_OFFSET_BITS.

	(read_pieced_value): Expand OFFSET, DEST_OFFSET_BITS,

	SOURCE_OFFSET_BITS, SOURCE_OFFSET to LONGEST.  Expand TYPE_LEN,

	THIS_SIZE, THIS_SIZE_BITS to ULONGEST.

	(write_pieced_value): Likewise.

	(check_pieced_value_bits): Expand parameters BIT_OFFSET and

	BIT_LENGTH to LONGEST.  Expand THIS_SIZE_BITS to ULONGEST.

	(check_pieced_value_validity): Expand parameters BIT_OFFSET and

	BIT_LENGTH to LONGEST.

	(check_pieced_synthetic_pointer): Likewise.

	(indirect_pieced_value): Expand BIT_LENGTH, BYTE_OFFSET and

	BIT_OFFSET to LONGEST.

	(dwarf2_evaluate_loc_desc_full): Expand N to ULONGEST.

	* dwarf2read.c (dwarf2_const_value_length_mismatch_complaint):

	Expand parameters ARG2 and ARG3 to LONGEST.  Use plongest to

	print ARG2 and ARG3.

	(dwarf2_add_field): Expand ANONYMOUS_SIZE, BIT_OFFSET to

	LONGEST.

	* eval.c (evaluate_struct_tuple): Expand BITPOS to LONGEST.

	(init_array_element): Expand ELEMENT_SIZE to LONGEST.

	(binop_promote): Expand PROMOTED_LEN1, PROMOTED_LEN2, RESULT_LEN

	to ULONGEST.

	(evaluate_subexp_standard): Expand MEM_OFFSET, TOP, ELEMENT_SIZE

	to LONGEST.

	* f-lang.c (f_printstr): Expand parameter LENGTH to ULONGEST.

	* f-lang.h (f_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	* f-valprint.c (f77_array_offset_tbl): Make LONGEST.

	(f77_create_arrayprint_offset_tbl): Expand ELTLEN to LONGEST.

	(f77_print_array_1): Expand parameter EMBEDDED_OFFSET to

	LONGEST.  Expand I to LONGEST.

	(f77_print_array): Expand parameter EMBEDDED_OFFSET to LONGEST.

	(f_val_print): Likewise.  Expand OFFSET to LONGEST.

	* findvar.c (default_value_from_register): Expand LEN to LONGEST.

	(read_frame_register_value): Expand OFFSET, REG_OFFSET, LEN,

	REG_LEN to LONGEST.

	* frame.c (get_frame_register_bytes): Expand parameter LEN to

	LONGEST.

	* frame.h (get_frame_register_bytes): Likewise.

	* gdbtypes.c (init_type): Expand parameter LENGTH to LONGEST.

	(is_unique_ancestor_worker): Expand parameters OFFSET,

	EMBEDDED_OFFSET to LONGEST.  Expand THIS_OFFSET to LONGEST.

	(is_unique_ancestor): Expand OFFSET to LONGEST.

	(recursive_dump_type): Use pulongest to format print TYPE_LENGTH.

	Use plongest to format print TYPE_FIELD_BITPOS.

	(arch_type): Expand parameter LENGTH to LONGEST.

	* gdbtypes.h (struct type.main_type.fld_bnds.fields): Expand

	member BITPOS to LONGEST.

	(struct type): Expand member LENGTH to ULONGEST.

	(init_type): Expand parameter LENGTH to LONGEST.

	(arch_type): Likewise.

	* gnu-v2-abi.c (gnuv2_virtual_fn_field): Expand parameter OFFSET

	to LONGEST.

	(gnuv2_value_rtti_type): Expand parameter TOP to point to LONGEST.

	(gnuv2_baseclass_offset): Return LONGEST.  Expand parameter

	EMBEDDED_OFFSET to LONGEST.  Expand FIELD_OFFSET, BOFFSET,

	FIELD_LENGTH to LONGEST.

	* gnu-v3-abi.c (build_gdb_vtable_type): Expand OFFSET to LONGEST.

	(vtable_address_point_offset): Return LONGEST.

	(gnuv3_rtti_type): Expand parameter TOP_P to point to LONGEST.

	(gnuv3_virtual_fn_field): Expand parameter OFFSET to LONGEST.

	(gnuv3_baseclass_offset): Return LONGEST.  Expand parameter

	EMBEDDED_OFSET to LONGEST.  Expand CUR_BASE_OFFSET, BASE_OFFSET to

	LONGEST.

	(gnuv3_find_method_in): Expand POS to LONGEST.

	* go-lang.h (go_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	* go-valprint.c (print_go_string): Likewise.

	(go_val_print): Likewise.

	* i386-nat.c (i386_handle_nonaligned_watchpoint): Expand

	parameter LEN to LONGEST.

	(i386_region_ok_for_watchpoint): Likewise.

	* inf-ttrace.c (inf_ttrace_region_ok_for_hw_watchpoint): Expand

	parameter LEN to LONGEST.

	* jv-lang.c (java_link_class_type): Expand BOFFSET to LONGEST.

	(java_printstr): Expand parameter LENGTH to ULONGEST.

	* jv-lang.h (java_val_print): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	* jv-valprint.c (java_print_value_fields): Expand parameter OFFSET

	to LONGEST.

	(java_val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	* language.c (unk_lang_printstr): Expand parameter LENGTH to

	ULONGEST.

	(unk_lang_val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	* language.h (language_defn): Expand parameter LENGTH of

	LA_PRINTSTR to ULONGEST.  Expand parameter EMBEDDED_OFFSET of

	LA_VAL_PRINT to LONGEST.

	* m2-lang.c (m2_printstr): Expand parameter LENGTH to ULONGEST.

	Expand I, REP1, REPS to ULONGEST.  Use pulongest to format print

	REPS.

	* m2-lang.h (m2_val_print): Expand parameter embedded_offset to

	LONGEST.

	* m2-typeprint.c (m2_array): New variable VAL.  Use pulongest to

	* format print VAL.

	(m2_enum): expand LASTVAL to LONGEST.

	* m2-valprint.c (m2_print_long_set): Expand parameter

	EMBEDDED_OFFSET to LONGEST.

	(m2_print_unbounded_array): Likewise.

	(m2_print_array_contents): Likewise.

	(m2_val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	Expand I, LEN, TEMP_LEN to ULONGEST.

	* memrange.c (mem_ranges_overlap): Expand parameters LEN1, LEN2 to

	LONGEST.

	* memrange.h (struct mem_range): Expand member LENGTH to LONGEST.

	(mem_ranges_overlap): Expand parameters LEN1, LEN2 to LONGEST.

	* mips-linux-nat.c (mips_linux_region_ok_for_hw_watchpoint):

	Expand parameter LEN to LONGEST.

	* objc-lang.c (objc_printstr): Expand parameter LENGTH to

	ULONGEST.  Expand I, REP1, REPS to ULONGEST.  use pulongest to

	format print REPS.

	* opencl-lang.c (lookup_opencl_vector_type): Expand parameter

	EL_LENGTH to ULONGEST.  Expand LENGTH to ULONGEST.

	(lval_func_read): Expand OFFSET, N, I, J and ELSIZE to LONGEST.

	(lval_func_write): Likewise.

	(lval_func_check_validity): Expand parameter LENGTH to LONGEST.

	Expand ELSIZE, START, END, I, STARTREST, ENDREST, COMP_OFFSET,

	COMP_LENGTH to LONGEST.

	(lval_func_check_any_valid): Expand ELSIZE to LONGEST.

	(lval_func_check_synthetic_pointer): Expand parameters OFFSET and

	LENGTH to LONGEST.  Expand ELSIZE, START, END, I, STARTREST,

	ENDREST, COMP_LENGTH, COMP_OFFSET to LONGEST.

	* p-lang.c (is_pascal_string_type): Expand parameters LENGTH_POS,

	STRING_POS, LENGTH_SIZE to point to LONGEST.

	(pascal_printstr): Expand parameter LENGTH to ULONGEST.  Expand

	I, REP1, REPS to ULONGEST.  Use pulongest to format print REPS.

	* p-lang.h (pascal_val_print): Expand parameter EMBEDDED_OFFSET

	to LONGEST.

	(is_pascal_string_type): Expand parameters LENGTH_POS, STRING_POS,

	LENGTH_SIZE to point to LONGEST.

	(pascal_printstr): Expand parameter LENGTH to ULONGEST.

	(pascal_object_print_value_fields): Expand parameter OFFSET to

	LONGEST.

	* p-valprint.c (pascal_val_print): Expand parameter

	EMBEDDED_OFFSET to LONGEST.  Expand ELTLEN to ULONGEST.  Expand

	LENGTH_SIZE, LENGTH_POS, STRING_POS to LONGEST.

	(pascal_object_print_value_fields): Expand parameter OFFSET to

	LONGEST.

	(pascal_object_print_value): Likewise.  Expand BOFFSET,

	THISOFFSET to LONGEST.

	* ppc-linux-nat.c (ppc_linux_region_ok_for_hw_watchpoint):

	Expand parameter LEN to point to LONGEST.

	* printcmd.c (print_formatted): Expand LEN to LONGEST.

	(print_scalar_formatted): Likewise.

	* procfs.c (procfs_region_ok_for_hw_watchpoint): Expand

	parameter LEN to LONGEST.

	* python/py-prettyprint.c (apply_val_pretty_printer): Expand

	parameter EMBEDDED_OFFSET to LONGEST.

	* python/python.h (apply_val_pretty_printer): Likewise.

	* regcache.c (regcache_xfer_part): Expand parameter OFFSET to

	LONGEST.

	(regcache_raw_read_part): Likewise.

	(regcache_raw_write_part): Likewise.

	(regcache_cooked_read_part): Likewise.

	(regcache_cooked_write_part): Likewise.

	* regcache.h (regcache_raw_read_part): Likewise.

	(regcache_raw_write_part): Likewise.

	(regcache_cooked_read_part): Likewise.

	(regcache_cooked_write_part): Likewise.

	* remote.c (remote_region_ok_for_hw_watchpoint): Expand

	parameter LEN to LONGEST.

	* s390-nat.c (s390_region_ok_for_hw_watchpoint): Expand

	parameter LEN to LONGEST.

	* spu-multiarch.c (spu_region_ok_for_hw_watchpoint): Expand

	parameter len to LONGEST.

	* stack.c (print_frame_nameless_args): Expand parameter START to

	LONGEST.

	(print_frame_args): Expand HIGHEST_OFFSET, CURRENT_OFFSET,

	ARG_SIZE, START to LONGEST.

	* symmisc.c (print_symbol): Expand I to ULONGEST.  Use pulongest

	to format print TYPE_LENGTH.

	* target.c (default_region_ok_for_hw_watchpoint): Expand parameter

	LEN to LONGEST.

	(debug_to_region_ok_for_hw_watchpoint): Likewise.

	* target.h (struct target_ops): Expand parameter LEN to LONGEST

	for TO_REGION_OK_FOR_HW_WATCHPOINT.

	* tracepoint.c (add_memrange): Expand parameter LEN to LONGEST.

	Use plongest to format print LEN.

	(collect_symbol): Expand LEN to ULONGEST.  Use pulongest to

	format print LEN.

	(scope_info): Expand J to LONGEST.  Use pulongest to format

	print TYPE_LENGTH.

	* typeprint.c (whatis_exp): Expand TOP to LONGEST.

	* valarith.c (value_subscripted_rvalue): Expand parameters INDEX

	and LOWERBOUND to LONGEST.  Expand ELT_SIZE, ELT_OFFS to ULONGEST.

	(value_concat): expand INVAL1LEN and INVAL2LEN to ssize_t.

	(value_logical_not): Expand LEN to LONGEST.

	(value_strcmp): Expand LEN1, LEN2, I, LEN to LONGEST.

	* valops.c (value_allocate_space_in_inferior): Expand parameter

	LEN to LONGEST.

	(value_cast_structs): Expand TOP to LONGEST.

	(value_cast): Expand ELEMENT_LENGTH to ULONGEST.  Expand

	VAL_LENGTH to LONGEST.

	(dynamic_cast_check_1): Expand parameter EMBEDDED_OFFSET to

	LONGEST.  Expand OFFSET to LONGEST.

	(dynamic_cast_check_2): Likewise.

	(value_dynamic_cast): Expand TOP to LONGEST.

	(read_value_memory): Expand EMBEDDED_OFFSET to LONGEST.

	(value_assign): Expand CHANGED_LEN, OFFSET to LONGEST.

	(value_array): Expand TYPELENGTH to ULONGEST.

	(update_search_result): Expand parameters LAST_BOFFSET, BOFFSET

	to LONGEST.

	(do_search_struct_field): Expand parameter OFFSET, LAST_BOFFSET

	to LONGEST.  Expand NEW_OFFSET, BOFFSET to LONGEST.

	(search_struct_field): Expand parameter OFFSET to LONGEST.

	Expand BOFFSET to LONGEST.

	(search_struct_method): Expand parameter OFFSET to LONGEST.

	Expand BASE_OFFSET, THIS_OFFSET to LONGEST.

	(find_method_list): Expand parameters OFFSET, BOFFSET to

	LONGEST.  Expand BASE_OFFSET to LONGEST.

	(value_find_oload_method_list): Expand parameter BOFFSET to point

	to LONGEST.

	(find_overload_match): Expand BOFFSET to LONGEST.

	(value_struct_elt_for_reference): Expand parameter OFFSET to

	LONGEST.  Remove unneeded cast.  Expand BASE_OFFSET to LONGEST.

	(value_rtti_indirect_type): Expand parameter TOP to point to

	LONGEST.

	(value_full_object): Expand parameter XTOP to LONGEST.  Expand

	TOP to LONGEST.

	* valprint.c (valprint_check_validity): Expand parameter

	EMBEDDED_OFFSET to LONGEST.

	(generic_val_print): Likewise.

	(val_print): Likewise.

	(val_print_scalar_formatted): Likewise.

	(print_hex_chars): Expand parameter LEN to ULONGEST.

	(val_print_array_elements): Expand parameter EMBEDDED_OFFSET to

	LONGEST, I to ULONGEST.  Expand LEN, ELTLEN, REP1, REPS to

	ULONGEST.  Use pulongest to format print REPS.

	(generic_printstr): Expand parameter LENGTH to ULONGEST.

	* valprint.h (val_print_array_elements): Expand parameter

	EMBEDDED_OFFSET to LONGEST.

	(val_print_scalar_formatted): Likewise.

	(print_hex_chars): Expand parameter LEN to ULONGEST.

	(generic_val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	(generic_printstr): Expand parameter LENGTH to ULONGEST.

	* value.c (struct range): Expand members OFFSET, LENGTH to

	LONGEST.

	(ranges_overlap): Expand parameters OFFSET1, OFFSET2, LEN1 AND

	LEN2 to LONGEST.

	(range_contain): Expand parameter OFFSET, LENGTH to LONGEST.

	(struct value): Expand members OFFSET, EMBEDDED_OFFSET,

	POINTED_TO_OFFSET to LONGEST.

	(value_bytes_available): Expand parameters OFFSET, LENGTH to

	LONGEST.

	(mark_value_bytes_unavailable): Likewise.

	(find_first_range_overlap): Likewise.

	(value_available_contents_eq): Expand parameters OFFSET1, OFFSET2

	and LENGTH to LONGEST.

	(value_offset): Return LONGEST.

	(set_value_offset): Expand parameter OFFSET to LONGEST.

	(value_contents_copy_raw): Expand parameters SRC_OFFSET,

	DST_OFFSET, LENGTH to ssize_t.

	(value_contents_copy): Likewise.

	(value_bits_valid): Expand parameters OFFSET, LENGTH to LONGEST.

	(value_bits_synthetic_pointer): Likewise.

	(value_embedded_offset): Return LONGEST.

	(set_value_embedded_offset): Expand parameter VAL to LONGEST.

	(value_pointed_to_offset): Return LONGEST.

	(set_value_pointed_to_offset): Expand parameter VAL to LONGEST.

	(set_internalvar_component): Expand parameter OFFSET to LONGEST.

	(value_primitive_field): Likewise.  Expand BITPOS, BOFFSET,

	CONTAINER_BITSIZE to LONGEST.

	(value_fn_field): Expand parameter OFFSET to LONGEST.

	(unpack_value_bits_as_long_1): Expand parameters EMBEDDED_OFFSET,

	BITPOS to LONGEST.  Expand READ_OFFSET to LONGEST.

	(unpack_value_bits_as_long): Expand parameter EMBEDED_OFFSET to

	LONGEST.

	(unpack_value_field_as_long_1): Likewise.  Expand BITPOS to

	LONGEST.

	(unpack_value_field_as_long): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(value_field_bitfield): Likewise.

	(modify_field): Expand parameter BITPOS to LONGEST.  Expand

	BYTESIZE to LONGEST.

	* value.h (value_offset): Return LONGEST.

	(set_value_offset): Expand parameter OFFSET to LONGEST.

	(value_pointed_to_offset): Return LONGEST.

	(set_value_pointed_to_offset): Expand parameter VAL to LONGEST.

	(value_embedded_offset): Return LONGEST.

	(set_value_embedded_offset): Expand parameter VAL to LONGEST.

	(struct lval_funcs): Expand parameters OFFSET and LENGTH to

	LONGEST for CHECK_VALIDITY.  Likewise for CHECK_SYNTHETIC_POINTER.

	(valprint_check_validity): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(value_bits_valid): Expand parameters OFFSET, LENGTH to LONGEST.

	(value_bits_synthetic_pointer): Likewise.

	(value_bytes_available): Likewise.

	(mark_value_bytes_unavailable): Likewise.

	(value_available_contents_eq): Fix comment.  Expand parameters

	OFFSET1, OFFSET2, LENGTH to LONGEST.

	(read_value_memory): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(unpack_value_bits_as_long): Expand parameter EMBEDDED_OFFSET to

	LONGEST.

	(unpack_value_field_as_long): Likewise.

	(value_field_bitfield): Likewise.

	(value_contents_copy_raw): Expand parameters SRC_OFFSET,

	DST_OFFSET, LENGTH to LONGEST.

	(value_contents_copy): Likewise.

	(value_primitive_field): Expand parameter OFFSET to LONGEST.

	(value_rtti_indirect_type): Expand parameter TOP to point to

	LONGEST.

	(value_full_object): Expand parameter XTOP to LONGEST.

	(set_internalvar_component): Expand parameter OFFSET to LONGEST.

	(value_fn_field): Expand parameter OFFSET to LONGEST.

	(modify_field): Expand parameter BITPOS to LONGEST.

	(val_print): Expand parameter EMBEDDED_OFFSET to LONGEST.

	(value_allocate_space_in_inferior): Expand parameter LEN to

	LONGEST.

gdb/testsuite/ChangeLog:

2012-08-05  Siddhesh Poyarekar  <siddhesh@redhat.com>

	* gdb.base/longest-types.exp: Add test case to get offset of

	BUF2.

--MP_/yp5f+W_ED2JtUlSyBi8xujr

Content-Type: text/x-patch

Content-Transfer-Encoding: 7bit

Content-Disposition: attachment; filename=bitpos-main.patch

Index: gdb-7.6.1/gdb/ada-lang.c

===================================================================

--- gdb-7.6.1.orig/gdb/ada-lang.c	2013-08-30 21:54:18.725367534 +0200

+++ gdb-7.6.1/gdb/ada-lang.c	2013-08-30 21:54:20.446368186 +0200

@@ -80,7 +80,7 @@ static struct type *desc_bounds_type (st

 static struct value *desc_bounds (struct value *);

-static int fat_pntr_bounds_bitpos (struct type *);

+static LONGEST fat_pntr_bounds_bitpos (struct type *);

 static int fat_pntr_bounds_bitsize (struct type *);

@@ -88,13 +88,13 @@ static struct type *desc_data_target_typ

 static struct value *desc_data (struct value *);

-static int fat_pntr_data_bitpos (struct type *);

+static LONGEST fat_pntr_data_bitpos (struct type *);

 static int fat_pntr_data_bitsize (struct type *);

 static struct value *desc_one_bound (struct value *, int, int);

-static int desc_bound_bitpos (struct type *, int, int);

+static LONGEST desc_bound_bitpos (struct type *, int, int);

 static int desc_bound_bitsize (struct type *, int, int);

@@ -174,7 +174,7 @@ static struct type *static_unwrap_type (

 static struct value *unwrap_value (struct value *);

-static struct type *constrained_packed_array_type (struct type *, long *);

+static struct type *constrained_packed_array_type (struct type *, LONGEST *);

 static struct type *decode_constrained_packed_array_type (struct type *);

@@ -189,7 +189,8 @@ static int ada_is_unconstrained_packed_a

 static struct value *value_subscript_packed (struct value *, int,

                                              struct value **);

-static void move_bits (gdb_byte *, int, const gdb_byte *, int, int, int);

+static void move_bits (gdb_byte *, int, const gdb_byte *, LONGEST, LONGEST,

+		       int);

 static struct value *coerce_unspec_val_to_type (struct value *,

                                                 struct type *);

@@ -217,14 +218,14 @@ static struct value *value_val_atr (stru

 static struct symbol *standard_lookup (const char *, const struct block *,

                                        domain_enum);

-static struct value *ada_search_struct_field (char *, struct value *, int,

+static struct value *ada_search_struct_field (char *, struct value *, LONGEST,

                                               struct type *);

-static struct value *ada_value_primitive_field (struct value *, int, int,

+static struct value *ada_value_primitive_field (struct value *, LONGEST, int,

                                                 struct type *);

-static int find_struct_field (const char *, struct type *, int,

-                              struct type **, int *, int *, int *, int *);

+static int find_struct_field (const char *, struct type *, LONGEST,

+			      struct type **, LONGEST *, int *, int *, int *);

 static struct value *ada_to_fixed_value_create (struct type *, CORE_ADDR,

                                                 struct value *);

@@ -240,7 +241,7 @@ static void ada_language_arch_info (stru

 static void check_size (const struct type *);

-static struct value *ada_index_struct_field (int, struct value *, int,

+static struct value *ada_index_struct_field (LONGEST, struct value *, LONGEST,

 					     struct type *);

 static struct value *assign_aggregate (struct value *, struct value *, 

@@ -587,7 +588,7 @@ coerce_unspec_val_to_type (struct value

 }

 static const gdb_byte *

-cond_offset_host (const gdb_byte *valaddr, long offset)

+cond_offset_host (const gdb_byte *valaddr, LONGEST offset)

 {

   if (valaddr == NULL)

     return NULL;

@@ -596,7 +597,7 @@ cond_offset_host (const gdb_byte *valadd

 }

 static CORE_ADDR

-cond_offset_target (CORE_ADDR address, long offset)

+cond_offset_target (CORE_ADDR address, LONGEST offset)

 {

   if (address == 0)

     return 0;

@@ -1602,7 +1603,7 @@ desc_bounds (struct value *arr)

 /* If TYPE is the type of an array-descriptor (fat pointer),  the bit

    position of the field containing the address of the bounds data.  */

-static int

+static LONGEST

 fat_pntr_bounds_bitpos (struct type *type)

 {

   return TYPE_FIELD_BITPOS (desc_base_type (type), 1);

@@ -1668,7 +1669,7 @@ desc_data (struct value *arr)

 /* If TYPE is the type of an array-descriptor (fat pointer), the bit

    position of the field containing the address of the data.  */

-static int

+static LONGEST

 fat_pntr_data_bitpos (struct type *type)

 {

   return TYPE_FIELD_BITPOS (desc_base_type (type), 0);

@@ -1703,7 +1704,7 @@ desc_one_bound (struct value *bounds, in

    of the Ith lower bound stored in it, if WHICH is 0, and the Ith upper

    bound, if WHICH is 1.  The first bound is I=1.  */

-static int

+static LONGEST

 desc_bound_bitpos (struct type *type, int i, int which)

 {

   return TYPE_FIELD_BITPOS (desc_base_type (type), 2 * i + which - 2);

@@ -1893,7 +1894,7 @@ ada_type_of_array (struct value *arr, in

 	         zero, and does not need to be recomputed.  */

 	      if (lo < hi)

 		{

-		  int array_bitsize =

+		  LONGEST array_bitsize =

 		        (hi - lo + 1) * TYPE_FIELD_BITSIZE (elt_type, 0);

 		  TYPE_LENGTH (array_type) = (array_bitsize + 7) / 8;

@@ -2045,7 +2046,7 @@ decode_packed_array_bitsize (struct type

    in bits.  */

 static struct type *

-constrained_packed_array_type (struct type *type, long *elt_bits)

+constrained_packed_array_type (struct type *type, LONGEST *elt_bits)

 {

   struct type *new_elt_type;

   struct type *new_type;

@@ -2097,7 +2098,7 @@ decode_constrained_packed_array_type (st

   char *name;

   const char *tail;

   struct type *shadow_type;

-  long bits;

+  LONGEST bits;

   if (!raw_name)

     raw_name = ada_type_name (desc_base_type (type));

@@ -2168,7 +2169,8 @@ decode_constrained_packed_array (struct

  	 array with no wrapper.  In order to interpret the value through

  	 the (left-justified) packed array type we just built, we must

  	 first left-justify it.  */

-      int bit_size, bit_pos;

+      int bit_size;

+      LONGEST bit_pos;

       ULONGEST mod;

       mod = ada_modulus (value_type (arr)) - 1;

@@ -2269,15 +2271,16 @@ has_negatives (struct type *type)

 struct value *

 ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,

-				long offset, int bit_offset, int bit_size,

+				LONGEST offset, int bit_offset, int bit_size,

                                 struct type *type)

 {

   struct value *v;

-  int src,                      /* Index into the source area */

-    targ,                       /* Index into the target area */

-    srcBitsLeft,                /* Number of source bits left to move */

-    nsrc, ntarg,                /* Number of source and target bytes */

-    unusedLS,                   /* Number of bits in next significant

+  int src;                      /* Index into the source area */

+  LONGEST targ;                 /* Index into the target area */

+  int srcBitsLeft,              /* Number of source bits left to move */

+    nsrc;                       /* Number of source bytes */

+  LONGEST ntarg;                /* Number of target bytes */

+  int unusedLS,                 /* Number of bits in next significant

                                    byte of source that are unused */

     accumSize;                  /* Number of meaningful bits in accum */

   unsigned char *bytes;         /* First byte containing data to unpack */

@@ -2310,7 +2313,7 @@ ada_value_primitive_packed_val (struct v

   if (obj != NULL)

     {

-      long new_offset = offset;

+      LONGEST new_offset = offset;

       set_value_component_location (v, obj);

       set_value_bitpos (v, bit_offset + value_bitpos (obj));

@@ -2427,7 +2430,7 @@ ada_value_primitive_packed_val (struct v

    not overlap.  */

 static void

 move_bits (gdb_byte *target, int targ_offset, const gdb_byte *source,

-	   int src_offset, int n, int bits_big_endian_p)

+	   LONGEST src_offset, LONGEST n, int bits_big_endian_p)

 {

   unsigned int accum, mask;

   int accum_bits, chunk_size;

@@ -2517,7 +2520,7 @@ ada_value_assign (struct value *toval, s

     {

       int len = (value_bitpos (toval)

 		 + bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;

-      int from_size;

+      LONGEST from_size;

       char *buffer = (char *) alloca (len);

       struct value *val;

       CORE_ADDR to_addr = value_address (toval);

@@ -2562,7 +2565,7 @@ value_assign_to_component (struct value

     (LONGEST)  (value_address (component) - value_address (container));

   int bit_offset_in_container = 

     value_bitpos (component) - value_bitpos (container);

-  int bits;

+  LONGEST bits;

   val = value_cast (value_type (component), val);

@@ -4083,7 +4086,7 @@ ensure_lval (struct value *val)

   if (VALUE_LVAL (val) == not_lval

       || VALUE_LVAL (val) == lval_internalvar)

     {

-      int len = TYPE_LENGTH (ada_check_typedef (value_type (val)));

+      LONGEST len = TYPE_LENGTH (ada_check_typedef (value_type (val)));

       const CORE_ADDR addr =

         value_as_long (value_allocate_space_in_inferior (len));

@@ -4157,7 +4160,7 @@ static CORE_ADDR

 value_pointer (struct value *value, struct type *type)

 {

   struct gdbarch *gdbarch = get_type_arch (type);

-  unsigned len = TYPE_LENGTH (type);

+  ULONGEST len = TYPE_LENGTH (type);

   gdb_byte *buf = alloca (len);

   CORE_ADDR addr;

@@ -6077,7 +6080,7 @@ value_tag_from_contents_and_address (str

 				     const gdb_byte *valaddr,

                                      CORE_ADDR address)

 {

-  int tag_byte_offset;

+  LONGEST tag_byte_offset;

   struct type *tag_type;

   if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,

@@ -6542,7 +6545,7 @@ ada_in_variant (LONGEST val, struct type

    only in that it can handle packed values of arbitrary type.  */

 static struct value *

-ada_value_primitive_field (struct value *arg1, int offset, int fieldno,

+ada_value_primitive_field (struct value *arg1, LONGEST offset, int fieldno,

                            struct type *arg_type)

 {

   struct type *type;

@@ -6554,7 +6557,7 @@ ada_value_primitive_field (struct value