From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from emagii.se (www.emagii.com [185.133.207.17]) by sourceware.org (Postfix) with ESMTPS id C1859384F031 for ; Mon, 13 Feb 2023 12:22:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C1859384F031 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=emagii.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=emagii.com Received: from valinor.ownit.se (84-55-68-216.customers.ownit.se [84.55.68.216]) by emagii.se (Postfix) with ESMTPSA id 5D973120245; Mon, 13 Feb 2023 13:22:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emagii.com; s=default; t=1676290977; bh=is4z5kJzf8R2GdUIdTRnIZIa8s2kzCFJkaWfmzCmUbs=; h=From:To:Subject; b=NPy9mLsCRPt9GDjFfcfCnoTp5qI1UEg4n3ZMTLrnTw3+/hkvz5HBHS4PfEqYUwCA1 tCaPr6B3vbNqyscQWNk9nwq51qkB3/nWieLvuKVHCFUSsKPFzrcBNxZFxk/zKwfd7V nfzuVX6vSR7ovtrzPLLDdg86y+PbuIr2v8DCAMMI= Authentication-Results: emagii.beebytevps.io; spf=pass (sender IP is 84.55.68.216) smtp.mailfrom=binutils@emagii.com smtp.helo=valinor.ownit.se Received-SPF: pass (emagii.beebytevps.io: connection is authenticated) From: binutils@emagii.com To: binutils@sourceware.org Cc: nickc@redhat.com, Ulf Samuelsson Subject: [PATCH v2 3/5] Parse ASCIZ command Date: Mon, 13 Feb 2023 13:22:39 +0100 Message-Id: <20230213122241.6144-4-binutils@emagii.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230213122241.6144-1-binutils@emagii.com> References: <20230213122241.6144-1-binutils@emagii.com> X-PPP-Message-ID: <167629097767.3735107.2880836267046477415@localhost.localdomain> X-PPP-Vhost: emagii.com X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_FAIL,SPF_PASS,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: From: Ulf Samuelsson Signed-off-by: Ulf Samuelsson --- ld/ldlang.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ld/ldlang.h | 4 +++ 2 files changed, 77 insertions(+) diff --git a/ld/ldlang.c b/ld/ldlang.c index 84a2914fc26..010e6e0fe22 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -8360,6 +8360,79 @@ lang_add_data (int type, union etree_union *exp) new_stmt->type = type; } +void +lang_add_string (bfd_vma size, char *s) +{ + lang_data_statement_type *new_stmt; + bfd_vma stringlen = strlen(s) + 1; /* Add one for terminating '\0' */ + bfd_vma fill_len = 0; + int escape = 0; + + if (size == 0) { /* Zero terminated string */ + size = stringlen; + } else if (size > stringlen) { /* Fix Size string */ + fill_len = size - stringlen; + } else if (size > stringlen) { + /* We have an error */ + einfo (_("%P:%pS: warning: string does not fit \"%s\"\n"), NULL, s); + } + /* Add byte expressions until end of string */ + for (bfd_vma i = 0 ; i < size ; i++) { + if (escape) { + char *p = &s[i]; + char c = *p; + if (c == 't') { + *p = '\t'; + } else if (c == 'n') { + *p = '\n'; + } else if (c == 'r') { + *p = '\r'; + } else if ((c >= '0') && (c <= '3')) { + int value = c; + c = p[1]; + if ((c >= '0') && (c <= '7')) { + value <<= 3; + value += (c - '0'); + i++; + c = p[2]; + if ((c >= '0') && (c <= '7')) { + value <<= 3; + value += (c - '0'); + i++; + } + } + s[i] = value; + } else { + /* whatever we have */ + } + new_stmt = new_stat (lang_data_statement, stat_ptr); + new_stmt->exp = exp_intop(s[i]); + new_stmt->type = BYTE; + escape = 0; + } else { + if (s[i] == '\\') { + escape = 1; + } else { + new_stmt = new_stat (lang_data_statement, stat_ptr); + new_stmt->exp = exp_intop(s[i]); + new_stmt->type = BYTE; + } + } + } + /* Add byte expressions for filling to the end of the string */ + for (bfd_vma i = 0 ; i < fill_len ; i++) { + new_stmt = new_stat (lang_data_statement, stat_ptr); + new_stmt->exp = exp_intop(0); + new_stmt->type = BYTE; + } +} + +void +lang_add_stringz (char *s) +{ + lang_add_string (0, s); +} + /* Create a new reloc statement. RELOC is the BFD relocation type to generate. HOWTO is the corresponding howto structure (we could look this up, but the caller has already done so). SECTION is the diff --git a/ld/ldlang.h b/ld/ldlang.h index 24c42f48218..a77a4802e3e 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -646,6 +646,10 @@ extern void pop_stat_ptr (void); extern void lang_add_data (int type, union etree_union *); +extern void +lang_add_string (bfd_vma size, char *s); +extern void +lang_add_stringz (char *s); extern void lang_add_reloc (bfd_reloc_code_real_type, reloc_howto_type *, asection *, const char *, union etree_union *); -- 2.17.1