From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by sourceware.org (Postfix) with ESMTPS id 1F3983857806 for ; Wed, 13 Apr 2022 19:18:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1F3983857806 Received: by mail-il1-x12f.google.com with SMTP id d4so1744611iln.6 for ; Wed, 13 Apr 2022 12:18:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rszI9wme40mDqZ59nLCSNpFJnX9cgg7T+1apdvwOM5o=; b=PkQ7ubAutRCWvqBXNh+DXyJjyhjnWjpt+/tHZ9OwGoy+WZdsd/4ztRWeVsB8cW5mPt RINIaDbr5FngF38nyuFV2n5jN0EIkpvp8THpUQ3OMUsfdV6LnKrK8FwrmPtfMZUGO3zw aAGCAiuiqu0/7jJFDecFKFgTigFFH89wa3EZ4jvZCe9f97vjgeQOWOhkAR04gld9hUma tc/NEZiXd4GadnPlGoVjGqJqEtFrtv1ydRBQ2AeTiAD8pQMpJu21Dm8yLAQas97mPTZj GyjEebjaYCyxr/VmMQcsnDEsm8jHQ4X00GToE9btd/2tkkfVxC2e+mFwDJS1VAXrjpqM KMaA== X-Gm-Message-State: AOAM531uMSZMovlfz8r3eGoXXwnZckkMGDXOwMEES0234/ScYXhbAXDr uZaZOpM0twdITBPtUlaSUWrujsBqOr5MHw== X-Google-Smtp-Source: ABdhPJzp4eiZ9jThL5kDikX4cCF0hPXbenc0BOrlKMGw+iZyH+9f+2Y07mCqZ817Zpvn77pf21uOmA== X-Received: by 2002:a92:cd84:0:b0:2ca:3bf1:fa08 with SMTP id r4-20020a92cd84000000b002ca3bf1fa08mr20087697ilb.219.1649877482343; Wed, 13 Apr 2022 12:18:02 -0700 (PDT) Received: from murgatroyd.Home (71-211-154-204.hlrn.qwest.net. [71.211.154.204]) by smtp.gmail.com with ESMTPSA id e203-20020a6bb5d4000000b0064dafa0416fsm427660iof.2.2022.04.13.12.18.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 12:18:01 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 4/9] Remove the byte order parameter to target_read_string Date: Wed, 13 Apr 2022 13:17:51 -0600 Message-Id: <20220413191756.1146768-5-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220413191756.1146768-1-tromey@adacore.com> References: <20220413191756.1146768-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2022 19:18:05 -0000 target_read_string takes a byte order parameter, but only uses this to check whether a given character is zero. This is readily done without requiring the parameter, so remove it. --- gdb/c-lang.c | 2 +- gdb/target.c | 3 +-- gdb/valprint.c | 12 +++++++----- gdb/valprint.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/c-lang.c b/gdb/c-lang.c index a7ecf8f91da..be9ee073f58 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -353,7 +353,7 @@ c_get_string (struct value *value, gdb::unique_xmalloc_ptr *buffer, fetchlimit = UINT_MAX; err = target_read_string (addr, *length, width, fetchlimit, - byte_order, buffer, length); + buffer, length); if (err != 0) memory_error (TARGET_XFER_E_IO, addr); } diff --git a/gdb/target.c b/gdb/target.c index 6542305f0d0..5a416d5ee3a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1406,8 +1406,7 @@ target_read_string (CORE_ADDR memaddr, int len, int *bytes_read) bytes_read = &ignore; /* Note that the endian-ness does not matter here. */ - int errcode = target_read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE, - &buffer, bytes_read); + int errcode = target_read_string (memaddr, -1, 1, len, &buffer, bytes_read); if (errcode != 0) return {}; diff --git a/gdb/valprint.c b/gdb/valprint.c index a4c0f7b343d..8f9954778c5 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2052,7 +2052,6 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr, int target_read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit, - enum bfd_endian byte_order, gdb::unique_xmalloc_ptr *buffer, int *bytes_read) { @@ -2122,12 +2121,15 @@ target_read_string (CORE_ADDR addr, int len, int width, limit = bufptr + nfetch * width; while (bufptr < limit) { - unsigned long c; + bool found_nonzero = false; + + for (int i = 0; !found_nonzero && i < width; ++i) + if (bufptr[i] != 0) + found_nonzero = true; - c = extract_unsigned_integer (bufptr, width, byte_order); addr += width; bufptr += width; - if (c == 0) + if (!found_nonzero) { /* We don't care about any error which happened after the NUL terminator. */ @@ -2733,7 +2735,7 @@ val_print_string (struct type *elttype, const char *encoding, fetchlimit = (len == -1 ? options->print_max : std::min ((unsigned) len, options->print_max)); - err = target_read_string (addr, len, width, fetchlimit, byte_order, + err = target_read_string (addr, len, width, fetchlimit, &buffer, &bytes_read); addr += bytes_read; diff --git a/gdb/valprint.h b/gdb/valprint.h index 2f4a5022b3e..b12495b10c1 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -167,7 +167,6 @@ extern void print_function_pointer_address (const struct value_print_options *op extern int target_read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit, - enum bfd_endian byte_order, gdb::unique_xmalloc_ptr *buffer, int *bytes_read); -- 2.34.1