From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by sourceware.org (Postfix) with ESMTPS id 3F35D38515FD for ; Thu, 14 Jul 2022 08:21:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3F35D38515FD Received: by mail-lf1-x12f.google.com with SMTP id t1so1570321lft.8 for ; Thu, 14 Jul 2022 01:21:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l8uCw0WyhuDiEWEakA3Cl64/4Z/pLZuQP39fx0x/Ur8=; b=t2PL84b4VnQBgsTuiiejPhK+IvqegromBsLDLTkF2+tLgh7OC+Rm7ozfgWN4EvNHat /BLxLtsY3JXFri7yjSXDhtNXmUf005P3o7hi3ZJ/QdD7FsgnwQNL3HArN/FgLsSp5tFY DnJDniGUie/UTFPuonWKW4NKnJsrdCOVrNj8Zy3LTDmpB5FsrZx9yBci/Ww2ZeOseHZ7 CNOEGq80OE3Cv3xEKRsalcFAV/MS7c7EDBJ5VQqj2x4iRixI8HQn2P71iWlTA9/FgHGk 3yNmYnY1e5CIRf/MIgbbP1Hxudc+9V7ztAUkMIOPcJ4HCjTM7/oPBWYmovqX3DnBIo4r kMmA== X-Gm-Message-State: AJIora/pgs7gL65X0KavDUxcyTyGl2/pOVhLHNkYfEE83n3oeybNDP1Y RGo7xuzNiXinE/P+EGDGqGVkmo1pLr0= X-Google-Smtp-Source: AGRyM1ul9LK6QfjEYd1PzxV5k6aeRNDt3TokdCu1Zhu47GIAOHodWXcX2aKVT1Pdhv2lVZl9aMweCg== X-Received: by 2002:a05:6512:3b9e:b0:489:ff28:2549 with SMTP id g30-20020a0565123b9e00b00489ff282549mr4336345lfv.23.1657786894552; Thu, 14 Jul 2022 01:21:34 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-220-156.ip.moscow.rt.ru. [188.32.220.156]) by smtp.gmail.com with ESMTPSA id x12-20020a056512078c00b0047fa941067fsm233873lfr.29.2022.07.14.01.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 01:21:34 -0700 (PDT) Sender: Dmitry Selyutin From: Dmitry Selyutin To: binutils@sourceware.org Cc: Alan Modra , Luke Leighton , Jan Beulich , Dmitry Selyutin Subject: [PATCH v2] ppc: use reg_name_search for CFI register lookup Date: Thu, 14 Jul 2022 11:21:12 +0300 Message-Id: <20220714082112.181581-1-ghostmansd@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2022 08:21:37 -0000 --- gas/config/tc-ppc.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 452fab1cbf..c6715535c7 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -7713,10 +7713,8 @@ ppc_cfi_frame_initial_instructions (void) int tc_ppc_regname_to_dw2regnum (char *regname) { - unsigned int regnum = -1; unsigned int i; - const char *p; - char *q; + const struct pd_reg *reg; static struct { const char *name; int dw2regnum; } regnames[] = { { "sp", 1 }, { "r.sp", 1 }, { "rtoc", 2 }, { "r.toc", 2 }, @@ -7729,23 +7727,22 @@ tc_ppc_regname_to_dw2regnum (char *regname) if (strcmp (regnames[i].name, regname) == 0) return regnames[i].dw2regnum; - if (regname[0] == 'r' || regname[0] == 'f' || regname[0] == 'v') - { - p = regname + 1 + (regname[1] == '.'); - regnum = strtoul (p, &q, 10); - if (p == q || *q || regnum >= 32) - return -1; - if (regname[0] == 'f') - regnum += 32; - else if (regname[0] == 'v') - regnum += 77; - } - else if (regname[0] == 'c' && regname[1] == 'r') - { - p = regname + 2 + (regname[2] == '.'); - if (p[0] < '0' || p[0] > '7' || p[1]) - return -1; - regnum = p[0] - '0' + 68; - } - return regnum; + if (regname[0] == '%' && ISALPHA (regname[1])) + ++regname; + + reg = reg_name_search (pre_defined_registers, + ARRAY_SIZE (pre_defined_registers), regname); + if (reg == NULL) + return -1; + + if ((reg->flags & PPC_OPERAND_GPR) == PPC_OPERAND_GPR) + return reg->value; + else if ((reg->flags & PPC_OPERAND_FPR) == PPC_OPERAND_FPR) + return (reg->value + 32); + else if ((reg->flags & PPC_OPERAND_VR) == PPC_OPERAND_VR) + return (reg->value + 77); + else if ((reg->flags & PPC_OPERAND_CR_REG) == PPC_OPERAND_CR_REG) + return (reg->value + 68); + else + return -1; } -- 2.37.0