From patchwork Fri Jan 10 16:43:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 104500 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 C60D93858289 for ; Fri, 10 Jan 2025 16:45:28 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-vk1-xa36.google.com (mail-vk1-xa36.google.com [IPv6:2607:f8b0:4864:20::a36]) by sourceware.org (Postfix) with ESMTPS id D9E733858401 for ; Fri, 10 Jan 2025 16:44:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D9E733858401 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D9E733858401 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736527477; cv=none; b=d7ZEiJCDYm94ghlaPTI8CcATb8SbeFVDQerouTYug1+Rhis8pPt5dVSt0cC/89i8PxP+wMDvUysl6rkdSQtlao940oufuv5Tz/Lb8d/Fav6aReTBIUrKJfHKbWLWd6XnlZsGPD/AALdTb/7Z824AG5qPw41C2dlojEd3BJtGe5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736527477; c=relaxed/simple; bh=5OY6L6dvILKOBfnwW5jeYggp5U+9ywdRz+OUQlRdXIg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=j2OkFL5HERnhoOkJH+YfOiabe4XTvTcFAxY3W4lOJxGQpoMaPM1/9Ba+T7DduUCrrEWEwrry6+8o5utr86SG9zDXGbGHx9Gfpl2Rwi9Zl8qo1hALpAlvfBdlpRmlzNJepe5xjWRcTi/Du3R2oCUI90oVBgLYlRVXFNxSDkyULGc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-vk1-xa36.google.com with SMTP id 71dfb90a1353d-5188b485988so772539e0c.3 for ; Fri, 10 Jan 2025 08:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736527477; x=1737132277; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9WMH9pe8J9opOlrEsZc1XAkeL6cecbx99LA9Ybn3z3U=; b=WHg6fqdHT6pRsX2uM2of1uhA4mD7wm3ZuH5iKsyn0HpidEuqsCG3NJ1apPa0xc1Jew PpjLqnwE6WokrZy9IXIMQUKcd2RJHNFqD08PRVNsWNGKB/0S/IbBBYUmSKZXxnZ25JtF SPxkQL5xiceiOtxYYOwe8d/xVqKX1Z5LVxrrJyOaFmVK8TO5crtDIXepqNfYObo7UZsD H9JVsaAYoCN32U94H6lv7KnT2ZHGa0pX/jJI3AsC7/BDwSy5pQ1kToj0Ce4IbE9U4bjY 1hSEMoKp95vLIYbHJZXTVCR4KaKbZYjAz+oXVDTzm2pIaIi3GzM68JVSh20AApXka6XC ZxAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736527477; x=1737132277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9WMH9pe8J9opOlrEsZc1XAkeL6cecbx99LA9Ybn3z3U=; b=L7Bqww25oHLQD2D3gezujDqMjpUQVf00es3sYRRS7gI28L7ij0WsAW64/ia4eBIl8O MCs28XV4sAruSsd3V4M63C/5XOqu7JqgMpD4anaHl1ElDdGjuNyXysDycawK0spp/2Vh shClEvdnUY40BKbAsxwlISXpjW/7h0R1onz83jWT76oA57xBi+e4L4shAPg0l2f7nBUj b0SVAHjdUbgRblkj/AL/tWa36pGCQUpXxFiZa8IPfV6mqGf7RzEu/MVc+oaAURMOv3NA 6lPxOKTmU9krmbYwMsiNCpMx6cKl5rCnnZoDzGG9rMkOYvdggtt1zOqoXeWQrgS7O9VH 2igg== X-Gm-Message-State: AOJu0YwMi+b0WxMOAkGZKxpFDVAItE9XsAeVyQvxaRm/fidksPuHn8Jm sKzIwi0W35SEqPIC3X4Y/JFQpSflMZ1HX82D/dkKlFOEqx+XeqkQijDJh7ZXpfhXidkWuNSokiB i X-Gm-Gg: ASbGnculDJK4Fs+KZPwkmgiyINg2sERCjWHpjTadyvgz+Nqx9/lT9ST4WgYmpdfedHy r9ny/9EmSaMg09MYfgtYedueD4FOA3tQVifmhThhBZ6clMjFq2uGOAp5AIBfmCtZnwBPyf1VDv6 +O5xJjtIcRg9vS9X+72tCEpfC41kfOwqZ0A4rQoEbRE191grifjt/4OZJgOKnZy/PRZTWCcpDoA RI/NSp+VtsAqJ3hUXoLrQriNn7/gIdTfkR2Nz+BUVpWfi2f7t1mhKbBPMFHubwSMA== X-Google-Smtp-Source: AGHT+IFbHahnn5Xpvl411z3pjWc/MrNTfvG4nA7b6swKm8fiKpyw23D34NVmwvXF/0nUqy1w/Fcl1Q== X-Received: by 2002:a05:6122:2207:b0:518:d26a:a819 with SMTP id 71dfb90a1353d-51c6c2b7b50mr10666397e0c.0.1736527477128; Fri, 10 Jan 2025 08:44:37 -0800 (PST) Received: from localhost ([2804:14d:7e39:8470:1b99:f53f:5bf8:21c]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-51c7fbfdc39sm2328133e0c.22.2025.01.10.08.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 08:44:36 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: "Aktemur, Tankut Baris" , Simon Marchi , "Maciej W. Rozycki" Subject: [PATCH 1/2] GDB: frame: Make VALUEP argument optional in frame_register_unwind Date: Fri, 10 Jan 2025 13:43:59 -0300 Message-ID: <20250110164430.3376697-2-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250110164430.3376697-1-thiago.bauermann@linaro.org> References: <20250110164430.3376697-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 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_NONE, SPF_HELO_NONE, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org It already accepts a nullptr value and a couple of places were always calling it that way, so make it possible to omit the argument entirely. --- gdb/frame.c | 4 ++-- gdb/frame.h | 4 ++-- gdb/stack.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/frame.c b/gdb/frame.c index a6900b280724..ba4a07179f64 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1447,7 +1447,7 @@ put_frame_register (const frame_info_ptr &next_frame, int regnum, gdb_assert (buf.size () == size); frame_register_unwind (next_frame, regnum, &optim, &unavail, &lval, &addr, - &realnum, nullptr); + &realnum); if (optim) error (_("Attempt to assign to a register that was not saved.")); switch (lval) @@ -2159,7 +2159,7 @@ frame_register_unwind_location (const frame_info_ptr &initial_this_frame, int unavailable; frame_register_unwind (this_frame, regnum, optimizedp, &unavailable, - lvalp, addrp, realnump, NULL); + lvalp, addrp, realnump); if (*optimizedp) break; diff --git a/gdb/frame.h b/gdb/frame.h index 9b41dd958fa4..b265c9bc5bb3 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -685,14 +685,14 @@ const char *unwind_stop_reason_to_string (enum unwind_stop_reason); const char *frame_stop_reason_string (const frame_info_ptr &); /* Unwind the stack frame so that the value of REGNUM, in the previous - (up, older) frame is returned. If VALUEP is NULL, don't + (up, older) frame is returned. If VALUEP is nullptr, don't fetch/compute the value. Instead just return the location of the value. */ extern void frame_register_unwind (const frame_info_ptr &frame, int regnum, int *optimizedp, int *unavailablep, enum lval_type *lvalp, CORE_ADDR *addrp, int *realnump, - gdb_byte *valuep); + gdb_byte *valuep = nullptr); /* Fetch a register from this, or unwind a register from the next frame. Note that the get_frame methods are wrappers to diff --git a/gdb/stack.c b/gdb/stack.c index 73165c801343..2d6712ab16ba 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1750,7 +1750,7 @@ info_frame_command_core (const frame_info_ptr &fi, bool selected_frame_p) /* Find out the location of the saved register without fetching the corresponding value. */ frame_register_unwind (fi, i, &optimized, &unavailable, - &lval, &addr, &realnum, NULL); + &lval, &addr, &realnum); /* For moment, only display registers that were saved on the stack. */ if (!optimized && !unavailable && lval == lval_memory) From patchwork Fri Jan 10 16:44:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 104501 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 A28743858283 for ; Fri, 10 Jan 2025 16:45:37 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-vs1-xe32.google.com (mail-vs1-xe32.google.com [IPv6:2607:f8b0:4864:20::e32]) by sourceware.org (Postfix) with ESMTPS id DA104385843D for ; Fri, 10 Jan 2025 16:44:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DA104385843D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DA104385843D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::e32 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736527482; cv=none; b=d9UP6rBA/cohDnJrIpbrGomK8oCAdg/PIMgeL7DwVjPPjJ1hrkYLuxH87eYVw4GmDUgovnIEWZ5uqiSWTefS/gaucbbxMJmedVQZ95/BZ9xOxaNp4nVr+yaw8AfyaFGIqUzT/4PPl9wppGjplT2Nw2GgJuRrgGSSnj8nC3j8NCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736527482; c=relaxed/simple; bh=VKlweMBa2AhDBr0GbggkoE/AiNYLIbhk5xz1GyfUJrA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=C24xXvKKv3dlLKh2sgiNEOMhcXMFgFBj3DQrcYONP2Ca5f4lUqEQkdRihwOEs69lPnzcoAE4NZwJl7YgCPCCNpuQclNcuDYPWtkM8ovp4w+Xf6CTE+qraVVYcagYXz+ghgF7RQnRc4In+FZRsHw55cohQEBJh1xI7p85Yq1e/co= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-vs1-xe32.google.com with SMTP id ada2fe7eead31-4affbb7ef2dso1549828137.0 for ; Fri, 10 Jan 2025 08:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736527481; x=1737132281; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4+DPBJySwNiK5n1TzChbfJqW5HNLc0KeXykioxBjIxI=; b=SOyYCXQ0Vbh8TVeDWZlwD7isnt95AsjvzD+S2TQdr0QEqRl6wJsLXCViJHCywP4Rnj VuHjzsKH2HFEziM6KT9l5Pk6sAwIMMGEgas4aRwzfwucP0l/9y0ugWYdj7RPyGGQPoMD edF2fFALJO9N07f2eyNZa5ffgWbUG4h3qeN1yaxbdSbbwOI3S7cuQvpbFdZH0sFSH4Q+ GmE2MlpJzeBEWHGjXV1/24aA8t/h09/Y9e2gj1J/2z/RtimP7qKJ28MMETHaUKBUj7rH U0hhwQF6Kfd2TNSsBOAOILddJv/O8RcHLKzAtEgSyV4rKJ47WVCgFJ8mXGsW7MkJHehi n86w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736527481; x=1737132281; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4+DPBJySwNiK5n1TzChbfJqW5HNLc0KeXykioxBjIxI=; b=uGlQ8QXjfzDQgt036Y6LYuibxN8C/s78UfHcn0Xu84oXcNU26mggghn0kSN4BDhgnI 7SXNze6chQgAGIngVnL4gqz2dUL19gAf4WltQk6UdRVfTn83kbAk346wLg9ialbohm9f Syhh6wjL1PUkSYhx4XS8PocDwvjRoLfyLaEiw5CRB/IFq/MjFwntzSi+XQICLyz/k6rb /ttZrIFkWYdWVcW2kevcNfyOqAypRTZ4jmfvpSadzn3n1HYgddXjaXieJWEcYBQ2dFAT /IXgU/7t2M74ooUEN32kIIrx5D/i8j2UPFEBd9z7H5CXbski4rCmfXVy/0PlVVtxDBWx NX8g== X-Gm-Message-State: AOJu0Yx+kE1Jzf9YmjlvuDLKjkhVvfpkBF289blAShseBmKhcLFJpVZo csx4ZSO4wg2R89hyICqxcoM3WZChtxuHzOcMNXS4muP8cZXJvphKgJn3y8ytimkthm55L+Autlr b X-Gm-Gg: ASbGncuJezHiAcbhYmfmPFB9d/THKXAZFLE8G48CgHK0ywJWOui7GtbS+mRo6ZDCGRR cSYerUybSkB8pAasN27l7WtkFPYpdKtR7GOBws9F81XcPPkppJkLsIpFAI41QoQ7VlEEr6+/HZt JuFZYigNs+gUMLq4uTgf3djyCzEpYuXdMo44b+rlGShGDnJ+uz6M6it8CqOEdQUc6GzMuhuKgy6 x8Fzj9q+up5QmSnew8S27lUaAdj4/Ib4tySynLw7eHAkrAmfjNbnbiTkilG4Tg4bw== X-Google-Smtp-Source: AGHT+IE3oNuR1QjY0bKbhCRXgETWTf+PAGmGiI5eSDX8s2/TLBdmFCfANoMCf/2DPEDtMjoHTY7jEw== X-Received: by 2002:a05:6102:509f:b0:4b2:ad50:ac27 with SMTP id ada2fe7eead31-4b3d0d9fd2emr11146816137.9.1736527480872; Fri, 10 Jan 2025 08:44:40 -0800 (PST) Received: from localhost ([2804:14d:7e39:8470:1b99:f53f:5bf8:21c]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4b60916de50sm2644827137.23.2025.01.10.08.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 08:44:40 -0800 (PST) From: Thiago Jung Bauermann To: gdb-patches@sourceware.org Cc: "Aktemur, Tankut Baris" , Simon Marchi , "Maciej W. Rozycki" Subject: [PATCH 2/2] GDB: Use gdb::array_view for buffers used in register reading and unwinding Date: Fri, 10 Jan 2025 13:44:00 -0300 Message-ID: <20250110164430.3376697-3-thiago.bauermann@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250110164430.3376697-1-thiago.bauermann@linaro.org> References: <20250110164430.3376697-1-thiago.bauermann@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 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 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org This allows checking the size of the given buffer. Changes frame_register_unwind (), frame_unwind_register (), get_frame_register () and deprecated_frame_register_read (). As pointed out by Baris, in the case of MIPS target code this is best done by changing a couple of alloca-based buffers in mips_read_fp_register_single and mips_print_fp_register to gdb::byte_vector instances. Reviewed-by: Thiago Jung Bauermann --- gdb/amd64-windows-tdep.c | 4 ++-- gdb/frame.c | 22 ++++++++++-------- gdb/frame.h | 10 ++++----- gdb/mips-tdep.c | 48 ++++++++++++++++++++++------------------ 4 files changed, 47 insertions(+), 37 deletions(-) Changes from RFCv4 patch 2: - Allocated gdb::byte_vectors instead of making array_views in mips-tdep.c, as suggested by Baris. This required changing raw_buffer in mips_print_fp_register (the caller of mips_read_fp_register_single and mips_read_fp_register_double) to a gdb::byte_vector as well, and also changing the rare_buffer arguments to array views. - Don't use std::optional for the buffer argument in frame_register_unwind, as suggested by Simon. - Changed the gdb_assert in frame_register_unwind to require the buffer argument to have the same size as the register. diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index 9e255bb2d433..ca7b7d96bc22 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -801,7 +801,7 @@ amd64_windows_frame_decode_insns (const frame_info_ptr &this_frame, std::array buf; int frreg = amd64_windows_w2gdb_regnum[frame_reg]; - get_frame_register (this_frame, frreg, buf.data ()); + get_frame_register (this_frame, frreg, buf); save_addr = extract_unsigned_integer (buf, byte_order); frame_debug_printf (" frame_reg=%s, val=%s", @@ -1097,7 +1097,7 @@ amd64_windows_frame_cache (const frame_info_ptr &this_frame, void **this_cache) /* Get current PC and SP. */ pc = get_frame_pc (this_frame); - get_frame_register (this_frame, AMD64_RSP_REGNUM, buf.data ()); + get_frame_register (this_frame, AMD64_RSP_REGNUM, buf); cache->sp = extract_unsigned_integer (buf, byte_order); cache->pc = pc; diff --git a/gdb/frame.c b/gdb/frame.c index ba4a07179f64..b64f9067ab9e 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1112,7 +1112,7 @@ frame_save_as_regcache (const frame_info_ptr &this_frame) { auto cooked_read = [this_frame] (int regnum, gdb::array_view buf) { - if (!deprecated_frame_register_read (this_frame, regnum, buf.data ())) + if (!deprecated_frame_register_read (this_frame, regnum, buf)) return REG_UNAVAILABLE; else return REG_VALID; @@ -1177,7 +1177,8 @@ void frame_register_unwind (const frame_info_ptr &next_frame, int regnum, int *optimizedp, int *unavailablep, enum lval_type *lvalp, CORE_ADDR *addrp, - int *realnump, gdb_byte *bufferp) + int *realnump, + gdb::array_view buffer) { struct value *value; @@ -1202,13 +1203,15 @@ frame_register_unwind (const frame_info_ptr &next_frame, int regnum, else *realnump = -1; - if (bufferp) + if (!buffer.empty ()) { + gdb_assert (buffer.size () == value->type ()->length ()); + if (!*optimizedp && !*unavailablep) - memcpy (bufferp, value->contents_all ().data (), + memcpy (buffer.data (), value->contents_all ().data (), value->type ()->length ()); else - memset (bufferp, 0, value->type ()->length ()); + memset (buffer.data (), 0, value->type ()->length ()); } /* Dispose of the new value. This prevents watchpoints from @@ -1217,7 +1220,8 @@ frame_register_unwind (const frame_info_ptr &next_frame, int regnum, } void -frame_unwind_register (const frame_info_ptr &next_frame, int regnum, gdb_byte *buf) +frame_unwind_register (const frame_info_ptr &next_frame, int regnum, + gdb::array_view buf) { int optimized; int unavailable; @@ -1238,7 +1242,7 @@ frame_unwind_register (const frame_info_ptr &next_frame, int regnum, gdb_byte *b void get_frame_register (const frame_info_ptr &frame, - int regnum, gdb_byte *buf) + int regnum, gdb::array_view buf) { frame_unwind_register (frame_info_ptr (frame->next), regnum, buf); } @@ -1482,7 +1486,7 @@ put_frame_register (const frame_info_ptr &next_frame, int regnum, bool deprecated_frame_register_read (const frame_info_ptr &frame, int regnum, - gdb_byte *myaddr) + gdb::array_view myaddr) { int optimized; int unavailable; @@ -1541,7 +1545,7 @@ get_frame_register_bytes (const frame_info_ptr &next_frame, int regnum, int realnum; frame_register_unwind (next_frame, regnum, optimizedp, unavailablep, - &lval, &addr, &realnum, buffer.data ()); + &lval, &addr, &realnum, buffer); if (*optimizedp || *unavailablep) return false; } diff --git a/gdb/frame.h b/gdb/frame.h index b265c9bc5bb3..e207c714c560 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -685,14 +685,14 @@ const char *unwind_stop_reason_to_string (enum unwind_stop_reason); const char *frame_stop_reason_string (const frame_info_ptr &); /* Unwind the stack frame so that the value of REGNUM, in the previous - (up, older) frame is returned. If VALUEP is nullptr, don't + (up, older) frame is returned. If VALUE is zero-sized, don't fetch/compute the value. Instead just return the location of the value. */ extern void frame_register_unwind (const frame_info_ptr &frame, int regnum, int *optimizedp, int *unavailablep, enum lval_type *lvalp, CORE_ADDR *addrp, int *realnump, - gdb_byte *valuep = nullptr); + gdb::array_view value = {}); /* Fetch a register from this, or unwind a register from the next frame. Note that the get_frame methods are wrappers to @@ -701,9 +701,9 @@ extern void frame_register_unwind (const frame_info_ptr &frame, int regnum, do return a lazy value. */ extern void frame_unwind_register (const frame_info_ptr &next_frame, - int regnum, gdb_byte *buf); + int regnum, gdb::array_view buf); extern void get_frame_register (const frame_info_ptr &frame, - int regnum, gdb_byte *buf); + int regnum, gdb::array_view buf); struct value *frame_unwind_register_value (const frame_info_ptr &next_frame, int regnum); @@ -889,7 +889,7 @@ extern void print_frame_info (const frame_print_options &fp_opts, extern frame_info_ptr block_innermost_frame (const struct block *); extern bool deprecated_frame_register_read (const frame_info_ptr &frame, int regnum, - gdb_byte *buf); + gdb::array_view buf); /* From stack.c. */ diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index c00efbd02ad0..d217f23631f8 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -951,14 +951,17 @@ mips_register_to_value (const frame_info_ptr &frame, int regnum, if (mips_convert_register_float_case_p (gdbarch, regnum, type)) { - get_frame_register (frame, regnum + 0, to + 4); - get_frame_register (frame, regnum + 1, to + 0); + gdb::array_view first_half = gdb::make_array_view (to, 4); + gdb::array_view second_half = gdb::make_array_view (to + 4, 4); - if (!get_frame_register_bytes (next_frame, regnum + 0, 0, { to + 4, 4 }, + get_frame_register (frame, regnum + 0, second_half); + get_frame_register (frame, regnum + 1, first_half); + + if (!get_frame_register_bytes (next_frame, regnum + 0, 0, second_half, optimizedp, unavailablep)) return 0; - if (!get_frame_register_bytes (next_frame, regnum + 1, 0, { to + 0, 4 }, + if (!get_frame_register_bytes (next_frame, regnum + 1, 0, first_half, optimizedp, unavailablep)) return 0; *optimizedp = *unavailablep = 0; @@ -6252,11 +6255,11 @@ mips_o64_return_value (struct gdbarch *gdbarch, struct value *function, static void mips_read_fp_register_single (const frame_info_ptr &frame, int regno, - gdb_byte *rare_buffer) + gdb::array_view rare_buffer) { struct gdbarch *gdbarch = get_frame_arch (frame); int raw_size = register_size (gdbarch, regno); - gdb_byte *raw_buffer = (gdb_byte *) alloca (raw_size); + gdb::byte_vector raw_buffer (raw_size); if (!deprecated_frame_register_read (frame, regno, raw_buffer)) error (_("can't read register %d (%s)"), @@ -6272,11 +6275,11 @@ mips_read_fp_register_single (const frame_info_ptr &frame, int regno, else offset = 0; - memcpy (rare_buffer, raw_buffer + offset, 4); + memcpy (rare_buffer.data (), raw_buffer.data () + offset, 4); } else { - memcpy (rare_buffer, raw_buffer, 4); + memcpy (rare_buffer.data (), raw_buffer.data (), 4); } } @@ -6286,7 +6289,7 @@ mips_read_fp_register_single (const frame_info_ptr &frame, int regno, static void mips_read_fp_register_double (const frame_info_ptr &frame, int regno, - gdb_byte *rare_buffer) + gdb::array_view rare_buffer) { struct gdbarch *gdbarch = get_frame_arch (frame); int raw_size = register_size (gdbarch, regno); @@ -6311,13 +6314,14 @@ mips_read_fp_register_double (const frame_info_ptr &frame, int regno, each register. */ if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) { - mips_read_fp_register_single (frame, regno, rare_buffer + 4); + mips_read_fp_register_single (frame, regno, rare_buffer.slice (4)); mips_read_fp_register_single (frame, regno + 1, rare_buffer); } else { mips_read_fp_register_single (frame, regno, rare_buffer); - mips_read_fp_register_single (frame, regno + 1, rare_buffer + 4); + mips_read_fp_register_single (frame, regno + 1, + rare_buffer.slice (4)); } } } @@ -6327,15 +6331,13 @@ mips_print_fp_register (struct ui_file *file, const frame_info_ptr &frame, int regnum) { /* Do values for FP (float) regs. */ struct gdbarch *gdbarch = get_frame_arch (frame); - gdb_byte *raw_buffer; std::string flt_str, dbl_str; const struct type *flt_type = builtin_type (gdbarch)->builtin_float; const struct type *dbl_type = builtin_type (gdbarch)->builtin_double; - raw_buffer - = ((gdb_byte *) - alloca (2 * register_size (gdbarch, mips_regnum (gdbarch)->fp0))); + gdb::byte_vector raw_buffer (2 * register_size (gdbarch, + mips_regnum (gdbarch)->fp0)); gdb_printf (file, "%s:", gdbarch_register_name (gdbarch, regnum)); gdb_printf (file, "%*s", @@ -6349,10 +6351,11 @@ mips_print_fp_register (struct ui_file *file, const frame_info_ptr &frame, /* 4-byte registers: Print hex and floating. Also print even numbered registers as doubles. */ mips_read_fp_register_single (frame, regnum, raw_buffer); - flt_str = target_float_to_string (raw_buffer, flt_type, "%-17.9g"); + flt_str = target_float_to_string (raw_buffer.data (), flt_type, + "%-17.9g"); get_formatted_print_options (&opts, 'x'); - print_scalar_formatted (raw_buffer, + print_scalar_formatted (raw_buffer.data (), builtin_type (gdbarch)->builtin_uint32, &opts, 'w', file); @@ -6361,7 +6364,8 @@ mips_print_fp_register (struct ui_file *file, const frame_info_ptr &frame, if ((regnum - gdbarch_num_regs (gdbarch)) % 2 == 0) { mips_read_fp_register_double (frame, regnum, raw_buffer); - dbl_str = target_float_to_string (raw_buffer, dbl_type, "%-24.17g"); + dbl_str = target_float_to_string (raw_buffer.data (), dbl_type, + "%-24.17g"); gdb_printf (file, " dbl: %s", dbl_str.c_str ()); } @@ -6372,13 +6376,15 @@ mips_print_fp_register (struct ui_file *file, const frame_info_ptr &frame, /* Eight byte registers: print each one as hex, float and double. */ mips_read_fp_register_single (frame, regnum, raw_buffer); - flt_str = target_float_to_string (raw_buffer, flt_type, "%-17.9g"); + flt_str = target_float_to_string (raw_buffer.data (), flt_type, + "%-17.9g"); mips_read_fp_register_double (frame, regnum, raw_buffer); - dbl_str = target_float_to_string (raw_buffer, dbl_type, "%-24.17g"); + dbl_str = target_float_to_string (raw_buffer.data (), dbl_type, + "%-24.17g"); get_formatted_print_options (&opts, 'x'); - print_scalar_formatted (raw_buffer, + print_scalar_formatted (raw_buffer.data (), builtin_type (gdbarch)->builtin_uint64, &opts, 'g', file);