From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpout42.security-mail.net (smtpout42.security-mail.net [85.31.212.42]) by sourceware.org (Postfix) with ESMTPS id E1A9C385803B for ; Fri, 16 Feb 2024 16:42:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E1A9C385803B Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kalrayinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kalrayinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E1A9C385803B Authentication-Results: server2.sourceware.org; arc=fail smtp.remote-ip=85.31.212.42 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708101753; cv=fail; b=SMSRlYXjOXkLex5BpHX8A76b6T4tK3llqE0zLBcuxmXDtBoqfTUbeJe7sEfMralt9PolrhVKu5zEf5/B16tARKyR22CHZF/4/eNEBAg1luNxMy9+PXvJar8gnftKLm4dteQ6XzPTesooBHibYXqBTERFNx8cG0btySFLCrf/qQo= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708101753; c=relaxed/simple; bh=SW5okHmm26e4fw+gAddzx7D1B+Q04Deg8vEp+Gw4uTY=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=RBeFjJAX/m8cEvVJJl5J5RvZxcu84pFrlhLBzD3m3Dt2Q9mHH6xjvPHZq084j66uwchwt4W80j0/mAuQPmIZdO7eR4MGDpkhK0wVuZv6VSxSSUZmxgWXsp2HSINcg+KR1/TfNDl471lPtcc/KWxMsvGK84upd9UUQypQKOurhu4= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by fx302.security-mail.net (Postfix) with ESMTP id 00D9562D32B for ; Fri, 16 Feb 2024 17:42:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalrayinc.com; s=sec-sig-email; t=1708101750; bh=SW5okHmm26e4fw+gAddzx7D1B+Q04Deg8vEp+Gw4uTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OuiMDwvhsxdsY5k638XSMRv8IDbeFFxYgvlLhu6zFMwsgg63iiu2ynZ7WrXciiCpM ApbGjdhaQlJEraHPXGkbmnkKiStGhXWpnvrcDF8bBbs76ws8nBnye9KfNCsgA7Ua0e XR5pJfq+vRreqNW6tCCIMcRl9uNs3NWfoqJ1hCBw= Received: from fx302 (localhost [127.0.0.1]) by fx302.security-mail.net (Postfix) with ESMTP id D64CF62D697 for ; Fri, 16 Feb 2024 17:42:29 +0100 (CET) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on0100.outbound.protection.outlook.com [104.47.25.100]) by fx302.security-mail.net (Postfix) with ESMTPS id 6DD5A62D840 for ; Fri, 16 Feb 2024 17:42:29 +0100 (CET) Received: from MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:33::22) by PR1P264MB3405.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.29; Fri, 16 Feb 2024 16:42:28 +0000 Received: from MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM ([fe80::bc00:fb42:2cd9:a178]) by MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM ([fe80::bc00:fb42:2cd9:a178%4]) with mapi id 15.20.7292.029; Fri, 16 Feb 2024 16:42:28 +0000 X-Virus-Scanned: E-securemail Secumail-id: ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kRkKkcYW9l5wL6+C22d4rm+kvr3b9UxBQNZMQmq0BRvZ/zK6ESL2ZYAP9HZmgkNw//GdH4OOzL8h5zShGJ02J+C6xBVMiF4UXrpfzw4++6JvPDtWaHjp206Jw2EYZntNyEKTTR2I9YilRXXFLzo5o6GsG2PnuaI/zh67ohBpxQm2em4RBjz7AcculNJi6p8VwfEiOMfF40PIy5b1A6UVhMehAJtxyD9f0N6YU5ncbhQnb8DI+kjqWsOIPtn366Xn/CoNpxxfmrT/hppWixEO5jHJSIfu0RTFKh6WM/qyEaKSaLexUExdwZZtn/ze1B3Gflrq9jPlZIAmwrajbE5eDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IlXsofkH2434pIrwJFPnfwB+Nn3u5ylHTOL5YMtxWEQ=; b=lxarygoxFW+ayPjePA7Ba1AF3ksd5bKwzVIBLef2Gfc6LKa4RyMj5k94OqL7Hk8bAXetnDAfoZQO1ZeesULZtauX9jlFddhfVuTP8hgPIUxTwAfcttvMZ4+husR7yF4d6/5lpVeiU+9kuo2lRMXkxkbtcTdgqvEFwTcQzHqLBN2OXIUo6B+BCg67aWwkC/nmVpBINTWcitEuzSNGABtGQvNRfG+UzmCICnWW34VFQFvdhCGxTVlcGPpr85vk1tHg2GcEpZQ1+G/LAxLaUbK48QPLTZgeO65n8hKAxRu3hdkrJwiPRjfqC5q62NEAIujn3S7szWdOIgxtPcIqVYIixA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kalrayinc.com; dmarc=pass action=none header.from=kalrayinc.com; dkim=pass header.d=kalrayinc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalrayinc.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IlXsofkH2434pIrwJFPnfwB+Nn3u5ylHTOL5YMtxWEQ=; b=hkn7w1i8P86gtuWz4e0PxnEclB39hz5ZIGo0LwwFBjyVtGGm3mw6fwq3oXnyFwBpaaoDYduNcQ7t3C4m97QYqEC8ATAjaBfn3anWGxce3HqJKmv2Ne/7XfCLSWYfBR8LVVNMtRSLBPlZd+9Gbxa/a075u7v8OuAj1M77MREY/zGR8pgRR92egr3QnxrncEq2xICJa0o6UmbruAFOYVCJ++qskrfNasZhKopTMHkiQcdElowe8khlOzfdDAra3XNsx9P2Ccfvo2PBdNr5LR2iEoL93EVd6vZi5cUHgF6+X5flyKSBDRKyXiA09R1liZWDDNfmkc1yiKxdaep/VmygqQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kalrayinc.com; From: Paul Iannetta To: binutils@sourceware.org Cc: Paul Iannetta Subject: [PATCH 2/7] kvx: Improve lexing & parsing Date: Fri, 16 Feb 2024 17:42:16 +0100 Message-ID: <20240216164221.24165-3-piannetta@kalrayinc.com> X-Mailer: git-send-email 2.35.1.500.gb896f729e2 In-Reply-To: <20240216164221.24165-1-piannetta@kalrayinc.com> References: <20240216164221.24165-1-piannetta@kalrayinc.com> Content-Transfer-Encoding: 8bit X-ClientProxiedBy: AM8P189CA0025.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::30) To MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:33::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2482:EE_|PR1P264MB3405:EE_ X-MS-Office365-Filtering-Correlation-Id: 355a6eda-23bf-44e2-f466-08dc2f0e4356 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g1ZGTe2IuYUgCwmrOTJyoMytNIOiIT4rNQOcoiNldp9AgbKc3LPHXPGGC+R+5Gu4QkMItK0ytmPqweUC1PUEfC3t1hxJGlCMRDiRX/ecvO2YDNsW0ntUih2HfNEhz/0tiKUELq8dOgiU3QYLTKv6AaKYcXT7FkGhpoqZ0pktZAJXjiltK46+BfFkckgkLLIew/HB2ataXcgIVdIvTlHYcxfmFVeuK0SctwzmO+Q2Ag6c9KpD+maOgK0PnC2Z1cwadxrB2+AEF1MtuqMQzVuC2ZNueoMe1A3Ou3F69Bn4Xxbfrj5B1OL4IblS8qMpWrBBqxk8mlKRAY3uPVf0dYoEl4EHfosjY2obp6SIGTzSf1B0/+YQnOiqUZj1J1Giqy5YDGa+O1dbaV3aJULe5HI+zPrt5/wxPp9F5lyJmuE3nZkXWAZKv/K26Og9SxXZsmX+KGa3rTlGh8SKbVnO3QoQy3SNqvTm94UQRjLThk6wfYdXfI8xbpYRjOI149U6r09cXeq6bPSkNphXwuP//1Q+lmQuQxS36xK2SJMKkBoGu6iCHkO30l/8kyjCfdzw+Sjz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366004)(376002)(39850400004)(136003)(346002)(396003)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(66556008)(66476007)(66946007)(6916009)(4326008)(2906002)(8676002)(83380400001)(8936002)(107886003)(38100700002)(86362001)(36756003)(316002)(6506007)(6486002)(478600001)(6666004)(6512007)(1076003)(2616005)(41300700001)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xLTBA5vd2Fvhe4FY6uYpgKTa1+uu+c1R3eRv1yQCFTe0CLlYk1blgs/HdrM6bo1Sdzyb3Oj3ag7P25sul5mgyiwbE9fLKZJErlY1dc4xc3Esn8HJXMBDeQ1BLm7DWRUgqOgkDTgjtKlB4C0ax7b7ZhIJaGP2JCVyE9wiTp6Qhtm7oxhXX6b8ciNam3hp0hZgkdAgXH8yBMkpEftuU7wxS1fL43r0fh6vNGOhe/z0Ll+n9Z1W+sUi5OCMj3k8eK/EwiMne6oIRkNiUSlUNufWsslTKHShJSa91Man4zoHSewU1s+Qco4CxApDVUbxYZxqHlhxSpSJZLHENKLjU6TMgOemErVMD2n6pOHTw6md/0o9i7SCymu6nEIKC38lqzql43lbISxanvcNjvcNxjQJ3umA5jb8NSb3P+3S4xkv0tbmwbx3AYg1u/fwcsfGq14FOyQJ7Vh8SSLAuWSHPp8kbuLkxB1Lx3NV7IkfhjI6CZ6NOY+ozgd8sIcPv4Gi6E9Efn0K4nzhHOoaMEXKISft+GCvtu7Qcc8hMdzDY7PFGl3yeTXjPMEe7etAyIMud0eVReSN40FFg6GFLOImwjrcIQvI8K/wB0OKJGHlFRmpUcAhjN1ubW9MisAKYj+slJZaD0ALvm/aVUYMvB6tHDnIpIVQm01ZtDQ3D3ZYXagz9RvS+0M3PjRsVwsTfnrxyiNMfHir0sv6V93+8bYh6rqh644maRx43M4VCngb00GgdaAgrjCbNKzAyLSpINekTRjtTVd67Eid+goQtFpeUGvhrOPxmplFBuUld2izj/VggYa/hLbVbI8lmVrN8Rmae1V0Dd5cPyEfQrvwZRuckMncYN9j+bT/jVxjZqEgFs0xdWvwVZXj14zdAIO+ASGNWVKkROH2+84KGPJJC7hpBlwI3q/ue24zEQ9sr1sdjwi0gc2IJz790uy0OCD6gwjNPhfR 0hrr8mi6I6gy5Qx48L6g9SgF7mCqi9DPXMgN8Qer3d05mWzeZk3eymZ2rkgwrEs6bH0XRkRO5uZc1f873gv5sWwx0dfE+h65kduCdAbBv5JbbkdZyJk3QncUAVdtO9xXh780bdNW2R+QjSfJ998tDFVDUGX+ExbYImu011tVK0WH1qbFrtiJlWizfkgcF0hRCBZHGcBI3xfstUtYOFZMjWFANnej4bNQ9Pn04jXrZ6mzm/p6u/+6U4e3AJdQ35m16fCCI0gX1ptTTW7QbQqjhOBNCWPffa0KcZ0AADCIcG5f3wieL4aup1nj2JVIQ9S6IS9kzr6PyjwhuZL8w8koL13Cit7dcfTRzFN0Mfh64OzViw0lI9QPAa+HPzfiU1tZlmos/MWsntMmJtOsPgrtENHgLsAr0Fhi33Q4QZEbHF1bqVvJM/QxXzua7mTxgVnbxIV9OQJIuhkDe4os/K1juh8oNsFD8jxAGHg2GSmpof2a5vSw2NOkpYdQcWbsPQ+Yi58gekQONUl0JcJQJTKDDLUudEeNpAliB0+jM2C58p5oAnlrte3MwAgJaPBWnxBGodvjU3py3yhZpnnYRU2m1ls/Ljtv+PAzrpqt1BtrQ85V40MZ67nMu6NL32N9nHcWlUzRzxMLRJjIs/8v09SbhA== X-OriginatorOrg: kalrayinc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 355a6eda-23bf-44e2-f466-08dc2f0e4356 X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2482.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2024 16:42:28.6737 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8931925d-7620-4a64-b7fe-20afd86363d3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wx0nD5kHEp4Yo4uI/aWa78cx6Ibde8vqyxUIDDMh6MHaGzfZfHYDexteybJld0xOwxKw5GXFgqBu58ZhMiNA3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR1P264MB3405 Content-Type: text/plain; charset=utf-8 X-ALTERMIMEV2_out: done X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TVD_PH_BODY_ACCOUNTS_POST,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 List-Id: Up until now, we used ENV.PROMOTE_IMMEDIATE to get the next candidates, however this candidate can be directly extracted from the array (in kvx-parse.h) registering all the immediates. During lexing, we ignored trailing characters after a number, this is not good enough since now number can be followed by a modifier. The function READ_TOKEN and GET_TOKEN_CLASS have been update to take this into account. gas/ChangeLog: * config/kvx-parse.c (promote_token): Do not rely on env.promote_immediate anymore. (get_token_class): Do not ignore trailing characters after a number. (read_token): Likewise. (print_token_list): THIS SHOULD NOT BE HERE. --- gas/config/kvx-parse.c | 53 ++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/gas/config/kvx-parse.c b/gas/config/kvx-parse.c index 0825b182319..bf837fc9b07 100644 --- a/gas/config/kvx-parse.c +++ b/gas/config/kvx-parse.c @@ -414,21 +414,25 @@ promote_token (struct token_s tok) input_line_pointer = tok.insn + tok.begin; expression (&exp); input_line_pointer = ilp_save; - int64_t new_class_id = tok.class_id; - int64_t old_class_id = tok.class_id; - while (((new_class_id = env.promote_immediate (old_class_id)) - != old_class_id) - && ((exp.X_op == O_symbol - && !(has_relocation_of_size - (str_hash_find (env.reloc_hash, - TOKEN_NAME (new_class_id))))) - || (exp.X_op == O_pseudo_fixup - && !(kvx_get_pseudo_func2 - (exp.X_op_symbol, - str_hash_find (env.reloc_hash, - TOKEN_NAME (new_class_id))))))) - old_class_id = new_class_id; - return new_class_id; + uint64_t val = tok.val; + uint64_t pval = ((int64_t) val) < 0 ? -val : val; + int neg_power2_p = ((int64_t) val) < 0 && !(pval & (pval - 1)); + struct token_class *class = env.token_classes->imm_classes; + unsigned len = pval ? 8 * sizeof (pval) - __builtin_clzll (pval) : 0; + + /* Find the imm class */ + int imm_idx = 0; + for (imm_idx = 0 ; class[imm_idx].class_id ; ++imm_idx) + if (class[imm_idx].class_id == tok.class_id) + break; + + while (class[imm_idx + 1].class_id != -1 + && ((unsigned int) (class[imm_idx + 1].sz < 0 ? - class[imm_idx + 1].sz - !neg_power2_p : class[imm_idx + 1].sz) < len + || (exp.X_op == O_symbol && !has_relocation_of_size (str_hash_find (env.reloc_hash, TOKEN_NAME (class[imm_idx + 1].class_id)))) + || (exp.X_op == 64 && !kvx_get_pseudo_func2 (exp.X_op_symbol, str_hash_find (env.reloc_hash, TOKEN_NAME (class[imm_idx + 1].class_id)))))) + imm_idx += 1; + + return class[imm_idx + 1].class_id == -1 ? class[imm_idx].class_id : class[imm_idx + 1].class_id; } default: return tok.class_id; @@ -481,6 +485,7 @@ get_token_class (struct token_s *token, struct token_classes *classes, int insn_ char *ilp_save = input_line_pointer; input_line_pointer = tok; expression (&exp); + token->end = token->begin + (input_line_pointer - tok); token->val = exp.X_add_number; token_val_p = 1; input_line_pointer = ilp_save; @@ -585,6 +590,16 @@ read_token (struct token_s *tok) char *str = tok->insn; int *begin = &tok->begin; int *end = &tok->end; + int last_imm_p = 0; + + /* Was the last previous token was an immediate? */ + for (int i = 1; *begin - i > 0; ++i) + { + if ('0' <= str[*begin - i] && str[*begin - i] <= '9') + last_imm_p = 1; + else if (str[*begin - i] != ' ' && str[*begin - i] != '\t') + break; + } /* Eat up all leading spaces. */ while (str[*begin] && (str[*begin] == ' ' || str[*begin] == '\n')) @@ -608,7 +623,9 @@ read_token (struct token_s *tok) return 1; } - if (str[*begin] == '.' && !(*begin > 0 && (str[*begin - 1] == ' ' || is_delim(str[*begin - 1])))) + if (str[*begin] == '.' + && (!(*begin > 0 && (str[*begin - 1] == ' ' || is_delim(str[*begin - 1]))) + || last_imm_p)) modifier_p = 1; /* This is a modifier or a register */ @@ -669,11 +686,11 @@ print_token_list (struct token_list *lst) struct token_list *cur = lst; while (cur) { - printf_debug (1, "%s (%d : %s : %d) / ", + printf_debug (0, "%s (%llu : %s : %llu) / ", cur->tok, cur->val, TOKEN_NAME (cur->class_id), cur->loc); cur = cur->next; } - printf_debug (1, "\n"); + printf_debug (0, "\n"); } void -- 2.35.1.500.gb896f729e2