From patchwork Fri Jul 5 16:22:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Samuelsson X-Patchwork-Id: 93436 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 14EE83889805 for ; Fri, 5 Jul 2024 16:24:36 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from morgoth (host183-192-94.customer.mediateknik.net [193.183.192.94]) by sourceware.org (Postfix) with ESMTP id 62F8A3830B47 for ; Fri, 5 Jul 2024 16:22:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62F8A3830B47 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=emagii.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=morgoth ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 62F8A3830B47 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=193.183.192.94 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720196574; cv=none; b=Arj0gwpUDc9s/igD/XkXNY8LwGOKs/Og9RDq39h45C4GHcFiZkg9n65XcDUprtBaQxuqdxNq+ABco8QtvY2MX+O4rQWWhJ+gOATF8c+LFqo7bQRd1v/dqiC77I446eaohV5t+Q+82X2WV2eLICKi8sD3g3ydVmCc2UPtyKXA1OQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720196574; c=relaxed/simple; bh=h9PGltVV5NXsCnfC8YF6NUpRdYsah7uSSn7suR5wdbI=; h=From:To:Subject:Date:Message-Id; b=Lvn8Gw1jjBxZpYAxEvcSDfdYSUU0jHbK0uHgmOUk7dAePZyLOFTZO8EZRFlU9uyIVnAJKGK+e9Kjl98izANpFdWwCnVeTnBwIitd1kRV1uOZwf6Q1deQ3CgA0W5Mc4hIMqHaF2HR7/6VTs900JN34/V/lDlZ5sQjl8qMNgQ0Mss= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by morgoth (Postfix, from userid 1000) id EFDA2340BEB; Fri, 5 Jul 2024 18:22:50 +0200 (CEST) From: binutils@emagii.com To: binutils@sourceware.org Cc: nickc@redhat.com, Ulf Samuelsson Subject: [PATCH v2 2/7] ldgram.y: Add ASCII parsing Date: Fri, 5 Jul 2024 18:22:43 +0200 Message-Id: <20240705162248.24954-3-binutils@emagii.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240705162248.24954-1-binutils@emagii.com> References: <20240705162248.24954-1-binutils@emagii.com> X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, FSL_HELO_NON_FQDN_1, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, HELO_NO_DOMAIN, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KHOP_HELO_FCRDNS, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org From: Ulf Samuelsson Signed-off-by: Ulf Samuelsson --- ld/ldgram.y | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ld/ldgram.y b/ld/ldgram.y index 7c04025f526..1d6965ff49d 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -128,7 +128,7 @@ static void yyerror (const char *); %right UNARY %token END %left '(' -%token ALIGN_K BLOCK BIND QUAD SQUAD LONG SHORT BYTE ASCIZ +%token ALIGN_K BLOCK BIND QUAD SQUAD LONG SHORT BYTE ASCII ASCIZ %token SECTIONS PHDRS INSERT_K AFTER BEFORE LINKER_VERSION %token DATA_SEGMENT_ALIGN DATA_SEGMENT_RELRO_END DATA_SEGMENT_END %token SORT_BY_NAME SORT_BY_ALIGNMENT SORT_NONE @@ -703,9 +703,18 @@ statement: { lang_add_data ((int) $1, $3); } + | ASCII mustbe_exp ',' NAME + { + /* 'value' is a memory leak, do we care? */ + etree_type *value = $2; + if (value->type.node_code == INT) + lang_add_string (value->value.value, $4); + else + einfo (_("%X%P:%pS: ASCII expression must be an integer\n"), NULL); + } | ASCIZ NAME { - lang_add_string ($2); + lang_add_string (0, $2); } | FILL '(' fill_exp ')' {