From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 78C813858D32 for ; Mon, 16 Oct 2023 14:36:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78C813858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 78C813858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697467010; cv=none; b=JF2T41XaABrcB7GDIdGn5jFuAqqFk+BxJIVp42B3aKS68rmVhOQzqmLjYQnQxhcsa8FI6WiR6RC9AhikcrniIU5XhuvMYXxE1WN0tPeLnGY8uTjS9ee1sztlufNkHfBjqWOGsmxwn5QL57xQNS94Xz4YlSlKIoPrK5WFFejWrpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697467010; c=relaxed/simple; bh=K7bPfojQE0MrNQQf42d8EBnenlUs7uVA9S+XSMgVuMU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=pExSR0+oiw/9j/6htOH2DAmNKMAYlJjYXoEn6ecaTBbyfNs4MsYYrbU7OeBurXCkOZJieZn7j61nGLdmP9xU9cvsDt+SMnbUvYZu0fUdV/25msbNijPHZEPcRukefreTOdwF3Nwk1HKiu/e6Oa23ryfjg3fUDHSsGfhvt+zYkwA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697467008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U2N93pWaP9sI5MjwNodTHScZ1LHVmE06aaCkUtSqXHQ=; b=IPvKLJaDf/XsaIHItgI7O33SOnrY0w3zLvemdajhEHg3qMZDKGP0vN92nVo5qLcd+WVVpH tdTsBrPXMlAFoTBpxpojwGiVebnr9iTM4Ju6Yk0b8/4URwt3MvV3jBtbA6pidO8ZOgvuLj QLEypt5V9yjU9MoPil4nTDGsL8dhgEA= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-68-_QHRsya3OGWkmuddJlcTyA-1; Mon, 16 Oct 2023 10:36:45 -0400 X-MC-Unique: _QHRsya3OGWkmuddJlcTyA-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-418198baf49so50528571cf.1 for ; Mon, 16 Oct 2023 07:36:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697467004; x=1698071804; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=U2N93pWaP9sI5MjwNodTHScZ1LHVmE06aaCkUtSqXHQ=; b=NKUlTRfZCf7oawSG1L8LAQduutxoCONT13X4MAH1uvloRsy2/xGMlgSMo8u3D+bCJG flI0Qocj9vvgEcNZxLBy2Ll47uqCpbZkSNg7H4gZx+e8mduTKAPtOj1uti6zV1k2sCnJ elFdG4l1Y6lrdU9s7YUiw4UdxdzXzGfas4Mqd9sqFV5/w1i6+lwRfszpABWM5vvYpH0y WLPRjguHA0PxmpNzD2vf67j29WRJauTiixi5hZtiii1QdB5RwRPtE9FZwQ8s7RUp4d2G FalEVWfbclsAdO9iPMiF1REWOo+aTTwcrhGoDRgHmVKG/5no4pgd5T9I01wDXxTBvOrs 0GDA== X-Gm-Message-State: AOJu0Yz308YSc8Hqw92bEfLMchT/yjJ9UhcJs1hyBn6ST2YVhZpq/CxZ /rtowHSRXAnVbPzJlLIMfYQowGXLivAsnPt+eNIGDy74juAPvEvHRzUb7h3omqNuXSoqGC8Awr3 YDe4fSSm6RbVDP+2T2zxVAg== X-Received: by 2002:ac8:7f86:0:b0:417:914a:104d with SMTP id z6-20020ac87f86000000b00417914a104dmr40245311qtj.49.1697467004398; Mon, 16 Oct 2023 07:36:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNo8GYSRnaSi3RnmPgnKdPm6bvJ0fXwIUAg9VjB3eS9V5sj8hPChk/Ao0NSopGb9S0xVjeLA== X-Received: by 2002:ac8:7f86:0:b0:417:914a:104d with SMTP id z6-20020ac87f86000000b00417914a104dmr40245293qtj.49.1697467004054; Mon, 16 Oct 2023 07:36:44 -0700 (PDT) Received: from localhost ([31.111.84.209]) by smtp.gmail.com with ESMTPSA id e24-20020ac84b58000000b004181aa90b46sm3064695qts.89.2023.10.16.07.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 07:36:43 -0700 (PDT) From: Andrew Burgess To: Carl Love , gdb-patches@sourceware.org, UlrichWeigand Cc: cel@us.ibm.com Subject: Re: [PATCH 2/2] PowerPC, Fix-test-gdb.base-store.exp In-Reply-To: <0a1d201b8868269496bcb15fd22811607e93a0c5.camel@us.ibm.com> References: <6f9c8fa20962129048384d74f6f15d1b37d255ed.camel@us.ibm.com> <0a1d201b8868269496bcb15fd22811607e93a0c5.camel@us.ibm.com> Date: Mon, 16 Oct 2023 15:36:42 +0100 Message-ID: <878r82hbwl.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Carl Love writes: > GDB maintainers: > > This is the second patch which fixes the 128-bit floating point > register mappings. > > Carl > -------------------------------------------------------- > Fix test gdb.base/store.exp > > The test currently fails for IEEE 128-bit floating point types. PowerPC > supports the IBM double 128-bit floating point format and IEEE 128-bit > format. The IBM double 128-bit floating point format uses two 64-bit > floating point registers to store the 128-bit value. The IEEE 128-bit > floating point format stores the value in a single 128-bit vector-scalar > register (vsr). > > The various floating point values, 32-bit float, 64-bit double, IBM double > 128-bit float and IEEE 128-bit floating point numbers are all mapped to the > DWARF fpr numbers. The issue is the IEEE 128-bit floating point values are > actually stored in a vsr not the fprs. This patch changes the register > mapping for the vsrs from the fpr to the vsr registers so the value is > properly accessed by GDB. The functions rs6000_linux_register_to_value, > rs6000_linux_value_to_register, rs6000_linux_value_from_register check if > the value is an IEEE 128-bit floating point value and adjust the register > number as needed. The test in function rs6000_convert_register_p is fixed > to so it is only true for floating point values. > > This patch fixes three regression tests in gdb.base/store.exp. > > The patch has been tested on Power 8 LE/BE, Power 9 LE/BE and Power 10 LE > with no regressions. > > Change to inline function > --- > gdb/ppc-linux-tdep.c | 4 +++ > gdb/rs6000-tdep.c | 66 +++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 69 insertions(+), 1 deletion(-) > > diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c > index 7fb90799dff..ba646a7230f 100644 > --- a/gdb/ppc-linux-tdep.c > +++ b/gdb/ppc-linux-tdep.c > @@ -63,6 +63,7 @@ > #include > #include "elf-bfd.h" > #include "producer.h" > +#include "target-float.h" > > #include "features/rs6000/powerpc-32l.c" > #include "features/rs6000/powerpc-altivec32l.c" > @@ -2101,6 +2102,9 @@ rs6000_linux_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int num) > /* FIXME: jimb/2004-05-05: What should we do when the debug info > specifies registers the architecture doesn't have? Our > callers don't check the value we return. */ > + /* Map dwarf register numbers for floating point, double, IBM double and > + IEEE 128-bit floating point to the fpr range. Will have to fix the > + mapping for the IEEE 128-bit register numbers later. */ > return tdep->ppc_fp0_regnum + (num - 32); > else if (77 <= num && num < 77 + 32) > return tdep->ppc_vr0_regnum + (num - 77); > diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c > index 23397d037ae..ada9cea3353 100644 > --- a/gdb/rs6000-tdep.c > +++ b/gdb/rs6000-tdep.c > @@ -2676,7 +2676,25 @@ rs6000_convert_register_p (struct gdbarch *gdbarch, int regnum, > && regnum < tdep->ppc_fp0_regnum + ppc_num_fprs > && type->code () == TYPE_CODE_FLT > && (type->length () > - != builtin_type (gdbarch)->builtin_double->length ())); > + == builtin_type (gdbarch)->builtin_float->length ())); > +} > + > +static int > +ieee_128_float_regnum_adjust (struct gdbarch *gdbarch, struct type *type, > + int regnum) > +{ > + ppc_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); > + > + /* If we have the an IEEE 128-bit floating point value, need to map the > + register number to the corresponding VSR. */ > + if (tdep->ppc_vsr0_regnum != -1 > + && regnum >= tdep->ppc_fp0_regnum > + && regnum < (tdep->ppc_fp0_regnum + ppc_num_fprs) > + && (gdbarch_long_double_format (gdbarch) == floatformats_ieee_quad) > + && (type->length() == 16)) > + regnum = regnum - tdep->ppc_fp0_regnum + tdep->ppc_vsr0_regnum; > + > + return regnum; > } > > static int > @@ -2691,6 +2709,10 @@ rs6000_register_to_value (frame_info_ptr frame, > > gdb_assert (type->code () == TYPE_CODE_FLT); > > + /* We have an IEEE 128-bit float need to change regnum mapping from > + fpr to vsr. */ > + regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum); > + > if (!get_frame_register_bytes (frame, regnum, 0, > gdb::make_array_view (from, > register_size (gdbarch, > @@ -2715,11 +2737,52 @@ rs6000_value_to_register (frame_info_ptr frame, > > gdb_assert (type->code () == TYPE_CODE_FLT); > > + /* We have an IEEE 128-bit float need to change regnum mapping from > + fpr to vsr. */ > + regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum); > + > target_float_convert (from, type, > to, builtin_type (gdbarch)->builtin_double); > put_frame_register (frame, regnum, to); > } > > +static struct value * > +rs6000_value_from_register (struct gdbarch *gdbarch, struct type *type, > + int regnum, struct frame_id frame_id) > +{ > + int len = type->length (); > + struct value *value = value::allocate (type); > + frame_info_ptr frame; > + > + /* We have an IEEE 128-bit float need to change regnum mapping from > + fpr to vsr. */ > + regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum); > + > + value->set_lval (lval_register); > + frame = frame_find_by_id (frame_id); You can move the declaration of frame to here: frame_info_ptr frame = frame_find_by_id (frame_id); which is the preferred GDB style these days. Reviewed-By: Andrew Burgess Thanks, Andrew > + > + if (frame == NULL) > + frame_id = null_frame_id; > + else > + frame_id = get_frame_id (get_next_frame_sentinel_okay (frame)); > + > + VALUE_NEXT_FRAME_ID (value) = frame_id; > + VALUE_REGNUM (value) = regnum; > + > + /* Any structure stored in more than one register will always be > + an integral number of registers. Otherwise, you need to do > + some fiddling with the last register copied here for little > + endian machines. */ > + if (type_byte_order (type) == BFD_ENDIAN_BIG > + && len < register_size (gdbarch, regnum)) > + /* Big-endian, and we want less than full size. */ > + value->set_offset (register_size (gdbarch, regnum) - len); > + else > + value->set_offset (0); > + > + return value; > +} > + > /* The type of a function that moves the value of REG between CACHE > or BUF --- in either direction. */ > typedef enum register_status (*move_ev_register_func) (struct regcache *, > @@ -8337,6 +8400,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) > set_gdbarch_convert_register_p (gdbarch, rs6000_convert_register_p); > set_gdbarch_register_to_value (gdbarch, rs6000_register_to_value); > set_gdbarch_value_to_register (gdbarch, rs6000_value_to_register); > + set_gdbarch_value_from_register (gdbarch, rs6000_value_from_register); > > set_gdbarch_stab_reg_to_regnum (gdbarch, rs6000_stab_reg_to_regnum); > set_gdbarch_dwarf2_reg_to_regnum (gdbarch, rs6000_dwarf2_reg_to_regnum); > -- > 2.37.2