From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id EBE183857830 for ; Wed, 13 Apr 2022 19:18:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EBE183857830 Received: by mail-io1-xd36.google.com with SMTP id e22so2995283ioe.11 for ; Wed, 13 Apr 2022 12:18:01 -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=h8QrzX3ityiS0kqVjzVbcR+AQEn5IDGXwFqkmrA98V8=; b=gKnUvs3qSGtRgaZAscQueq+vH59bnu2TDQ9PJqoAPYmwuT3Z4j+OfwVsNqpBRBxxuw /ylnAvgR0CLbRHU403UrclfA7iyYAi9RFfNEbdTDGEy1wPP+WP3NKnCwQMSYcaHT/p7z vowzPO6d+V/AmXjxhltm49YFXBjXlFoOnNU09SHsJo1YYPOygpjKoiqAijIEUyqrdRDk InbG3fOS7XNNGbxkd7sie466snApX64j2WjSWJWnxV5G/kh1D5iAicO+CZrhPFyWTpio 1OrLnmr5K+tw0JAJAFto10KOb3aXu8r7yzApX1aJErAciH2iyytg3n/whQaX2sA3Heyo PpYQ== X-Gm-Message-State: AOAM533p8BbU0Sdzj0r68RBfvUmdw03Y2DWrWmW6CGT4lXS5rxxXzBmu HBx5Ihx/85WrlKI4ZTgsv/FZhG1C60uBYw== X-Google-Smtp-Source: ABdhPJytYXG8B0Y5GuoJZNtVhZUy0euGyGVtUE7Rp6Wi6CzcgJMDOGd27zccpTJRYSo2M2iyGMKBzg== X-Received: by 2002:a02:29c2:0:b0:323:a234:9df7 with SMTP id p185-20020a0229c2000000b00323a2349df7mr22602717jap.43.1649877481320; Wed, 13 Apr 2022 12:18:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 12:18:00 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/9] Rename read_string Date: Wed, 13 Apr 2022 13:17:50 -0600 Message-Id: <20220413191756.1146768-4-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:03 -0000 This renames read_string to be an overload of target_read_string. This makes it more consistent for the eventual merger with gdbserver. --- gdb/c-lang.c | 4 ++-- gdb/target.c | 4 ++-- gdb/valprint.c | 12 +++++++----- gdb/valprint.h | 10 +++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 014dbefb8e2..a7ecf8f91da 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -352,8 +352,8 @@ c_get_string (struct value *value, gdb::unique_xmalloc_ptr *buffer, if (*length > 0) fetchlimit = UINT_MAX; - err = read_string (addr, *length, width, fetchlimit, - byte_order, buffer, length); + err = target_read_string (addr, *length, width, fetchlimit, + byte_order, buffer, length); if (err != 0) memory_error (TARGET_XFER_E_IO, addr); } diff --git a/gdb/target.c b/gdb/target.c index f33bf345cfa..6542305f0d0 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1406,8 +1406,8 @@ 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 = read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE, - &buffer, bytes_read); + int errcode = target_read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE, + &buffer, bytes_read); if (errcode != 0) return {}; diff --git a/gdb/valprint.c b/gdb/valprint.c index 65b85cfb038..a4c0f7b343d 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2050,9 +2050,11 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr, failure happened. Check BYTES_READ to recognize this situation. */ int -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) +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) { int errcode; /* Errno returned from bad reads. */ unsigned int nfetch; /* Chars to fetch / chars fetched. */ @@ -2731,8 +2733,8 @@ val_print_string (struct type *elttype, const char *encoding, fetchlimit = (len == -1 ? options->print_max : std::min ((unsigned) len, options->print_max)); - err = read_string (addr, len, width, fetchlimit, byte_order, - &buffer, &bytes_read); + err = target_read_string (addr, len, width, fetchlimit, byte_order, + &buffer, &bytes_read); addr += bytes_read; diff --git a/gdb/valprint.h b/gdb/valprint.h index 0586836f9e6..2f4a5022b3e 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -165,11 +165,11 @@ extern void print_function_pointer_address (const struct value_print_options *op CORE_ADDR address, struct ui_file *stream); -extern int 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); +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); /* Helper function to check the validity of some bits of a value. -- 2.34.1