From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-91421-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 31436 invoked by alias); 23 May 2012 07:10:54 -0000
Received: (qmail 31415 invoked by uid 22791); 23 May 2012 07:10:52 -0000
X-SWARE-Spam-Status: No, hits=-5.5 required=5.0	tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail-vb0-f41.google.com (HELO mail-vb0-f41.google.com) (209.85.212.41)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 May 2012 07:10:38 +0000
Received: by vbbey12 with SMTP id ey12so5627521vbb.0        for <gdb-patches@sourceware.org>; Wed, 23 May 2012 00:10:37 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;        d=google.com; s=20120113;        h=mime-version:in-reply-to:references:date:message-id:subject:from:to         :cc:content-type:content-transfer-encoding:x-system-of-record         :x-gm-message-state;        bh=lgccyp9MN44Wj2OBgg+oOcQ9Uyw07iht7hl8ve2iXMM=;        b=IW4BE5M2enr/se4WNdU7AdMXqKVWaagRlvKo830um1Sw8ehn4e5xHMZCR8s2RySNWE         URQgB6D2uE56F6tB5dG7DOFoZQIQ4RdO+ayb3b8Sq48Sx2bjjs0Aw00YVMGU5ZI+TEeK         BhXuX3JPM6GBpF4ZaAopELWqbMuilhu8e5+u8DB1U8YrjywNRNgwfhISHw3CCgQQ0hz7         S77EMHuaBuyEQ/sXbWDQDre9c4frd7Hnzz9e8VQcXDcdWuUndKbA1snSU9Ad0gNWKqW4         MHl7rJ+JKvhOakquRWEcs/i04jW2upiWKsaG5+5ujyt3Ng8A2iOSvsRZ5r5+oo3sac2l         lxpA==
Received: by 10.220.221.7 with SMTP id ia7mr1138500vcb.31.1337757037310;        Wed, 23 May 2012 00:10:37 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.220.221.7 with SMTP id ia7mr1138492vcb.31.1337757037158; Wed, 23 May 2012 00:10:37 -0700 (PDT)
Received: by 10.52.172.166 with HTTP; Wed, 23 May 2012 00:10:37 -0700 (PDT)
In-Reply-To: <m3r4ubo7j0.fsf@redhat.com>
References: <20120523015503.GA25312@sourceware.org>	<m3r4ubo7j0.fsf@redhat.com>
Date: Wed, 23 May 2012 07:10:00 -0000
Message-ID: <CADPb22QBYSRjoqrgX7p0d5KdAZ+kEk4Ga2YrfHMrm_t_yKCE6w@mail.gmail.com>
Subject: Re: New ARI warning Wed May 23 01:55:03 UTC 2012
From: Doug Evans <dje@google.com>
To: Sergio Durigan Junior <sergiodj@redhat.com>
Cc: gdb-patches@sourceware.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-System-Of-Record: true
X-Gm-Message-State: ALoCoQmke2uaBfsI9ZrpZ6jeU94B+EMutGrR2xCM3w3iPSX/8vY9X3MfGV6VJx1UVDSo4go3CKH4Uajf6PsHCdTwPnh0GmQlXdtKHtviGUjkjuKpzW1wuox75ZK2HEb1z/EEX9/QPqVs67yhwLBeiwZ3Hcr6YZ9PZA==
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2012-05/txt/msg00863.txt.bz2

Well, blech.
src/include/leb128.h uses long long per request, so that's what I used here.
src/include/anything obviously cannot use LONGEST/ULONGEST.

Are long long's really verboten?

I suppose I could create a gdb-leb128.h that used LONGEST/ULONGEST,
but blech.


On Tue, May 22, 2012 at 9:17 PM, Sergio Durigan Junior
<sergiodj@redhat.com> wrote:
> WDYT about the following patch? =A0I would like you to take a look at the
> gdb/dwarf2expr.h's castings that I had to make in order to get the
> compilation right.
>
> Thanks,
>
> --
> Sergio
>
> diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
> index 96fa451..fd463ed 100644
> --- a/gdb/dwarf2-frame.c
> +++ b/gdb/dwarf2-frame.c
> @@ -416,8 +416,8 @@ execute_cfa_program (struct dwarf2_fde *fde, const gd=
b_byte *insn_ptr,
> =A0 while (insn_ptr < insn_end && fs->pc <=3D pc)
> =A0 =A0 {
> =A0 =A0 =A0 gdb_byte insn =3D *insn_ptr++;
> - =A0 =A0 =A0unsigned long long utmp, reg;
> - =A0 =A0 =A0long long offset;
> + =A0 =A0 =A0ULONGEST utmp, reg;
> + =A0 =A0 =A0LONGEST offset;
>
> =A0 =A0 =A0 if ((insn & 0xc0) =3D=3D DW_CFA_advance_loc)
> =A0 =A0 =A0 =A0fs->pc +=3D (insn & 0x3f) * fs->code_align;
> @@ -1628,7 +1628,7 @@ read_encoded_value (struct comp_unit *unit, gdb_byt=
e encoding,
> =A0 =A0 {
> =A0 =A0 case DW_EH_PE_uleb128:
> =A0 =A0 =A0 {
> - =A0 =A0 =A0 unsigned long long value;
> + =A0 =A0 =A0 ULONGEST value;
> =A0 =A0 =A0 =A0const gdb_byte *end_buf =3D buf + (sizeof (value) + 1) * 8=
 / 7;
>
> =A0 =A0 =A0 =A0*bytes_read_ptr +=3D safe_read_uleb128 (buf, end_buf, &val=
ue) - buf;
> @@ -1645,7 +1645,7 @@ read_encoded_value (struct comp_unit *unit, gdb_byt=
e encoding,
> =A0 =A0 =A0 return (base + bfd_get_64 (unit->abfd, (bfd_byte *) buf));
> =A0 =A0 case DW_EH_PE_sleb128:
> =A0 =A0 =A0 {
> - =A0 =A0 =A0 long long value;
> + =A0 =A0 =A0 LONGEST value;
> =A0 =A0 =A0 =A0const gdb_byte *end_buf =3D buf + (sizeof (value) + 1) * 8=
 / 7;
>
> =A0 =A0 =A0 =A0*bytes_read_ptr +=3D safe_read_sleb128 (buf, end_buf, &val=
ue) - buf;
> @@ -1830,8 +1830,8 @@ decode_frame_entry_1 (struct comp_unit *unit, const=
 gdb_byte *start,
> =A0 int dwarf64_p;
> =A0 ULONGEST cie_id;
> =A0 ULONGEST cie_pointer;
> - =A0long long sleb128;
> - =A0unsigned long long uleb128;
> + =A0LONGEST sleb128;
> + =A0ULONGEST uleb128;
>
> =A0 buf =3D start;
> =A0 length =3D read_initial_length (unit->abfd, buf, &bytes_read);
> @@ -1978,7 +1978,7 @@ decode_frame_entry_1 (struct comp_unit *unit, const=
 gdb_byte *start,
> =A0 =A0 =A0 cie->saw_z_augmentation =3D (*augmentation =3D=3D 'z');
> =A0 =A0 =A0 if (cie->saw_z_augmentation)
> =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 unsigned long long length;
> + =A0 =A0 =A0 =A0 ULONGEST length;
>
> =A0 =A0 =A0 =A0 =A0buf =3D gdb_read_uleb128 (buf, end, &length);
> =A0 =A0 =A0 =A0 =A0if (buf =3D=3D NULL)
> @@ -2095,7 +2095,7 @@ decode_frame_entry_1 (struct comp_unit *unit, const=
 gdb_byte *start,
> =A0 =A0 =A0 =A0 can skip the whole thing. =A0*/
> =A0 =A0 =A0 if (fde->cie->saw_z_augmentation)
> =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 unsigned long long length;
> + =A0 =A0 =A0 =A0 ULONGEST length;
>
> =A0 =A0 =A0 =A0 =A0buf =3D gdb_read_uleb128 (buf, end, &length);
> =A0 =A0 =A0 =A0 =A0if (buf =3D=3D NULL)
> diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
> index 80c6e17..fc29637 100644
> --- a/gdb/dwarf2expr.c
> +++ b/gdb/dwarf2expr.c
> @@ -373,7 +373,7 @@ dwarf_expr_eval (struct dwarf_expr_context *ctx, cons=
t gdb_byte *addr,
>
> =A0const gdb_byte *
> =A0safe_read_uleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0unsigned long long *r)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ULONGEST *r)
> =A0{
> =A0 buf =3D gdb_read_uleb128 (buf, buf_end, r);
> =A0 if (buf =3D=3D NULL)
> @@ -385,7 +385,7 @@ safe_read_uleb128 (const gdb_byte *buf, const gdb_byt=
e *buf_end,
>
> =A0const gdb_byte *
> =A0safe_read_sleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0long long *r)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0LONGEST *r)
> =A0{
> =A0 buf =3D gdb_read_sleb128 (buf, buf_end, r);
> =A0 if (buf =3D=3D NULL)
> @@ -465,7 +465,7 @@ dwarf_get_base_type (struct dwarf_expr_context *ctx, =
cu_offset die, int size)
> =A0int
> =A0dwarf_block_to_dwarf_reg (const gdb_byte *buf, const gdb_byte *buf_end)
> =A0{
> - =A0unsigned long long dwarf_reg;
> + =A0ULONGEST dwarf_reg;
>
> =A0 if (buf_end <=3D buf)
> =A0 =A0 return -1;
> @@ -509,8 +509,8 @@ int
> =A0dwarf_block_to_dwarf_reg_deref (const gdb_byte *buf, const gdb_byte *b=
uf_end,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0CORE_ADDR =
*deref_size_return)
> =A0{
> - =A0unsigned long long dwarf_reg;
> - =A0long long offset;
> + =A0ULONGEST dwarf_reg;
> + =A0LONGEST offset;
>
> =A0 if (buf_end <=3D buf)
> =A0 =A0 return -1;
> @@ -568,7 +568,7 @@ int
> =A0dwarf_block_to_fb_offset (const gdb_byte *buf, const gdb_byte *buf_end,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0CORE_ADDR *fb_offset_r=
eturn)
> =A0{
> - =A0long long fb_offset;
> + =A0LONGEST fb_offset;
>
> =A0 if (buf_end <=3D buf)
> =A0 =A0 return 0;
> @@ -595,8 +595,8 @@ int
> =A0dwarf_block_to_sp_offset (struct gdbarch *gdbarch, const gdb_byte *buf,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const gdb_byte *buf_en=
d, CORE_ADDR *sp_offset_return)
> =A0{
> - =A0unsigned long long dwarf_reg;
> - =A0long long sp_offset;
> + =A0ULONGEST dwarf_reg;
> + =A0LONGEST sp_offset;
>
> =A0 if (buf_end <=3D buf)
> =A0 =A0 return 0;
> @@ -665,8 +665,8 @@ execute_stack_op (struct dwarf_expr_context *ctx,
> =A0 =A0 =A0 =A0 This is just an optimization, so it's always ok to punt
> =A0 =A0 =A0 =A0 and leave this as 0. =A0*/
> =A0 =A0 =A0 int in_stack_memory =3D 0;
> - =A0 =A0 =A0unsigned long long uoffset, reg;
> - =A0 =A0 =A0long long offset;
> + =A0 =A0 =A0ULONGEST uoffset, reg;
> + =A0 =A0 =A0LONGEST offset;
> =A0 =A0 =A0 struct value *result_val =3D NULL;
>
> =A0 =A0 =A0 /* The DWARF expression might have a bug causing an infinite
> @@ -839,7 +839,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
>
> =A0 =A0 =A0 =A0case DW_OP_implicit_value:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long len;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST len;
>
> =A0 =A0 =A0 =A0 =A0 =A0op_ptr =3D safe_read_uleb128 (op_ptr, op_end, &len=
);
> =A0 =A0 =A0 =A0 =A0 =A0if (op_ptr + len > op_end)
> @@ -860,7 +860,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
>
> =A0 =A0 =A0 =A0case DW_OP_GNU_implicit_pointer:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 long long len;
> + =A0 =A0 =A0 =A0 =A0 LONGEST len;
>
> =A0 =A0 =A0 =A0 =A0 =A0if (ctx->ref_addr_size =3D=3D -1)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0error (_("DWARF-2 expression error: DW_OP_GNU_=
implicit_pointer "
> @@ -1291,7 +1291,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
>
> =A0 =A0 =A0 =A0 case DW_OP_piece:
> =A0 =A0 =A0 =A0 =A0 {
> - =A0 =A0 =A0 =A0 =A0 =A0unsigned long long size;
> + =A0 =A0 =A0 =A0 =A0 =A0ULONGEST size;
>
> =A0 =A0 =A0 =A0 =A0 =A0 /* Record the piece. =A0*/
> =A0 =A0 =A0 =A0 =A0 =A0 op_ptr =3D safe_read_uleb128 (op_ptr, op_end, &si=
ze);
> @@ -1308,7 +1308,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
>
> =A0 =A0 =A0 =A0case DW_OP_bit_piece:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long size, offset;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST size, offset;
>
> =A0 =A0 =A0 =A0 =A0 =A0 /* Record the piece. =A0*/
> =A0 =A0 =A0 =A0 =A0 =A0op_ptr =3D safe_read_uleb128 (op_ptr, op_end, &siz=
e);
> @@ -1354,7 +1354,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
>
> =A0 =A0 =A0 =A0case DW_OP_GNU_entry_value:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long len;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST len;
> =A0 =A0 =A0 =A0 =A0 =A0int dwarf_reg;
> =A0 =A0 =A0 =A0 =A0 =A0CORE_ADDR deref_size;
>
> diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
> index 82a5a93..57fe39e 100644
> --- a/gdb/dwarf2expr.h
> +++ b/gdb/dwarf2expr.h
> @@ -311,9 +311,9 @@ int dwarf_block_to_sp_offset (struct gdbarch *gdbarch=
, const gdb_byte *buf,
>
> =A0static inline const gdb_byte *
> =A0gdb_read_uleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 unsigned long long *r)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ULONGEST *r)
> =A0{
> - =A0size_t bytes_read =3D read_uleb128_to_ull (buf, buf_end, r);
> + =A0size_t bytes_read =3D read_uleb128_to_ull (buf, buf_end, (unsigned l=
ong long *) r);
>
> =A0 if (bytes_read =3D=3D 0)
> =A0 =A0 return NULL;
> @@ -322,9 +322,9 @@ gdb_read_uleb128 (const gdb_byte *buf, const gdb_byte=
 *buf_end,
>
> =A0static inline const gdb_byte *
> =A0gdb_read_sleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 long long *r)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 LONGEST *r)
> =A0{
> - =A0size_t bytes_read =3D read_sleb128_to_ll (buf, buf_end, r);
> + =A0size_t bytes_read =3D read_sleb128_to_ll (buf, buf_end, (long long *=
) r);
>
> =A0 if (bytes_read =3D=3D 0)
> =A0 =A0 return NULL;
> @@ -343,11 +343,11 @@ gdb_skip_leb128 (const gdb_byte *buf, const gdb_byt=
e *buf_end)
>
> =A0extern const gdb_byte *safe_read_uleb128 (const gdb_byte *buf,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 unsigned long long *r);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 ULONGEST *r);
>
> =A0extern const gdb_byte *safe_read_sleb128 (const gdb_byte *buf,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0const gdb_byte *buf_end,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 long long *r);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
 =A0 =A0 LONGEST *r);
>
> =A0extern const gdb_byte *safe_skip_leb128 (const gdb_byte *buf,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 const gdb_byte *buf_end);
> diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
> index 9bd7741..14af020 100644
> --- a/gdb/dwarf2loc.c
> +++ b/gdb/dwarf2loc.c
> @@ -139,7 +139,7 @@ decode_debug_loc_dwo_addresses (struct dwarf2_per_cu_=
data *per_cu,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0const gdb_=
byte **new_ptr,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0CORE_ADDR =
*low, CORE_ADDR *high)
> =A0{
> - =A0unsigned long long low_index, high_index;
> + =A0ULONGEST low_index, high_index;
>
> =A0 if (loc_ptr =3D=3D buf_end)
> =A0 =A0 return DEBUG_LOC_BUFFER_OVERFLOW;
> @@ -2566,8 +2566,8 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr,=
 struct axs_value *loc,
> =A0 while (op_ptr < op_end)
> =A0 =A0 {
> =A0 =A0 =A0 enum dwarf_location_atom op =3D *op_ptr;
> - =A0 =A0 =A0unsigned long long uoffset, reg;
> - =A0 =A0 =A0long long offset;
> + =A0 =A0 =A0ULONGEST uoffset, reg;
> + =A0 =A0 =A0LONGEST offset;
> =A0 =A0 =A0 int i;
>
> =A0 =A0 =A0 offsets[op_ptr - base] =3D expr->len;
> @@ -2725,7 +2725,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr,=
 struct axs_value *loc,
>
> =A0 =A0 =A0 =A0case DW_OP_implicit_value:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long len;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST len;
>
> =A0 =A0 =A0 =A0 =A0 =A0op_ptr =3D safe_read_uleb128 (op_ptr, op_end, &len=
);
> =A0 =A0 =A0 =A0 =A0 =A0if (op_ptr + len > op_end)
> @@ -3075,7 +3075,7 @@ dwarf2_compile_expr_to_ax (struct agent_expr *expr,=
 struct axs_value *loc,
> =A0 =A0 =A0 =A0 case DW_OP_piece:
> =A0 =A0 =A0 =A0case DW_OP_bit_piece:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long size, offset;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST size, offset;
>
> =A0 =A0 =A0 =A0 =A0 =A0if (op_ptr - 1 =3D=3D previous_piece)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0error (_("Cannot translate empty pieces to age=
nt expressions"));
> @@ -3267,7 +3267,7 @@ locexpr_describe_location_piece (struct symbol *sym=
bol, struct ui_file *stream,
> =A0 =A0 }
> =A0 else if (data[0] =3D=3D DW_OP_regx)
> =A0 =A0 {
> - =A0 =A0 =A0unsigned long long reg;
> + =A0 =A0 =A0ULONGEST reg;
>
> =A0 =A0 =A0 data =3D safe_read_uleb128 (data + 1, end, &reg);
> =A0 =A0 =A0 fprintf_filtered (stream, _("a variable in $%s"),
> @@ -3278,10 +3278,10 @@ locexpr_describe_location_piece (struct symbol *s=
ymbol, struct ui_file *stream,
> =A0 =A0 =A0 struct block *b;
> =A0 =A0 =A0 struct symbol *framefunc;
> =A0 =A0 =A0 int frame_reg =3D 0;
> - =A0 =A0 =A0long long frame_offset;
> + =A0 =A0 =A0LONGEST frame_offset;
> =A0 =A0 =A0 const gdb_byte *base_data, *new_data, *save_data =3D data;
> =A0 =A0 =A0 size_t base_size;
> - =A0 =A0 =A0long long base_offset =3D 0;
> + =A0 =A0 =A0LONGEST base_offset =3D 0;
>
> =A0 =A0 =A0 new_data =3D safe_read_sleb128 (data + 1, end, &frame_offset);
> =A0 =A0 =A0 if (!piece_end_p (new_data, end))
> @@ -3335,7 +3335,7 @@ locexpr_describe_location_piece (struct symbol *sym=
bol, struct ui_file *stream,
> =A0 else if (data[0] >=3D DW_OP_breg0 && data[0] <=3D DW_OP_breg31
> =A0 =A0 =A0 =A0 =A0 && piece_end_p (data, end))
> =A0 =A0 {
> - =A0 =A0 =A0long long offset;
> + =A0 =A0 =A0LONGEST offset;
>
> =A0 =A0 =A0 data =3D safe_read_sleb128 (data + 1, end, &offset);
>
> @@ -3409,8 +3409,8 @@ disassemble_dwarf_expression (struct ui_file *strea=
m,
> =A0 =A0 =A0 =A0 =A0 =A0 || (data[0] !=3D DW_OP_piece && data[0] !=3D DW_O=
P_bit_piece)))
> =A0 =A0 {
> =A0 =A0 =A0 enum dwarf_location_atom op =3D *data++;
> - =A0 =A0 =A0unsigned long long ul;
> - =A0 =A0 =A0long long l;
> + =A0 =A0 =A0ULONGEST ul;
> + =A0 =A0 =A0LONGEST l;
> =A0 =A0 =A0 const char *name;
>
> =A0 =A0 =A0 name =3D get_DW_OP_name (op);
> @@ -3630,7 +3630,7 @@ disassemble_dwarf_expression (struct ui_file *strea=
m,
>
> =A0 =A0 =A0 =A0case DW_OP_bit_piece:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long offset;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST offset;
>
> =A0 =A0 =A0 =A0 =A0 =A0data =3D safe_read_uleb128 (data, end, &ul);
> =A0 =A0 =A0 =A0 =A0 =A0data =3D safe_read_uleb128 (data, end, &offset);
> @@ -3685,7 +3685,7 @@ disassemble_dwarf_expression (struct ui_file *strea=
m,
>
> =A0 =A0 =A0 =A0case DW_OP_GNU_regval_type:
> =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 unsigned long long reg;
> + =A0 =A0 =A0 =A0 =A0 ULONGEST reg;
> =A0 =A0 =A0 =A0 =A0 =A0cu_offset type_die;
> =A0 =A0 =A0 =A0 =A0 =A0struct type *type;
>
> @@ -3794,7 +3794,7 @@ locexpr_describe_location_1 (struct symbol *symbol,=
 CORE_ADDR addr,
> =A0 =A0 =A0 =A0 =A0 =A0fprintf_filtered (stream, " =A0 ");
> =A0 =A0 =A0 =A0 =A0if (data[0] =3D=3D DW_OP_piece)
> =A0 =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 =A0 unsigned long long bytes;
> + =A0 =A0 =A0 =A0 =A0 =A0 ULONGEST bytes;
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0data =3D safe_read_uleb128 (data + 1, end, &by=
tes);
>
> @@ -3807,7 +3807,7 @@ locexpr_describe_location_1 (struct symbol *symbol,=
 CORE_ADDR addr,
> =A0 =A0 =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0 =A0else if (data[0] =3D=3D DW_OP_bit_piece)
> =A0 =A0 =A0 =A0 =A0 =A0{
> - =A0 =A0 =A0 =A0 =A0 =A0 unsigned long long bits, offset;
> + =A0 =A0 =A0 =A0 =A0 =A0 ULONGEST bits, offset;
>
> =A0 =A0 =A0 =A0 =A0 =A0 =A0data =3D safe_read_uleb128 (data + 1, end, &bi=
ts);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0data =3D safe_read_uleb128 (data, end, &offset=
);