From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id WRDJBkldrV87UAAAWB0awg (envelope-from ) for ; Thu, 12 Nov 2020 11:05:29 -0500 Received: by simark.ca (Postfix, from userid 112) id 0FFFC1F08B; Thu, 12 Nov 2020 11:05:29 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AC3B81E58E for ; Thu, 12 Nov 2020 11:05:28 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 049283A16048; Thu, 12 Nov 2020 16:05:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 049283A16048 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1605197128; bh=K54eUpqPi6bQMTnXMqqI8J2xagjOP9DSzklejYswW1E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=dbbhogNT1DZJctzYJL+33yd4oRuVXqTZ7gUu1XQb9aK0hpbNXpPsmuCynoyNW2CcT t/UYuXrPK0jn5WaBSLrkXKJJ3cqOXJ3vk8KaaSuU4NK86ZXHkAuUvX6Pmn3x2UF4qn CQMRtpMZ+afvXutSWiYEtzUrq4P0tw9J6mSV/nwo= Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by sourceware.org (Postfix) with ESMTPS id 47923386F02A for ; Thu, 12 Nov 2020 16:05:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 47923386F02A Received: by mail-ej1-x642.google.com with SMTP id f23so8650522ejk.2 for ; Thu, 12 Nov 2020 08:05:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K54eUpqPi6bQMTnXMqqI8J2xagjOP9DSzklejYswW1E=; b=mrCOZQt11sbQg8hch8EpmH1IHNYSib/8rHQZaxzOIgX6wyxvZKWXsNzvp1j3+k4CkU WyeRAYAadWWyAT4/f6Nb5CQwu8s6Kym6OEmrg+73R0QryW8l+5Qvp+YOYBbKJjNAOEkr V0NiibtE8iaGDumijwOY8QywrlVb1smj7R0cIOw4eEBCAeHy2WiRlv9/f/B2tGiUmU8U YrnyzrkGFl8wa/Mu+ifOpO+u7dRm9Q8+8x/0YF+7XcHpjs1kmFR37awN39WlQ8xs7D3M mm4wnb8nnUGLexpDbGlJrm722XjEZ49BdQ/OiqQB08iDKCEgnYiIeQQHJH1r3QKhlpJe 3Txw== X-Gm-Message-State: AOAM532ewIRsC6YQoPDv/lfvhZ7locUyXLT5GQIQgGr34YDbCJ18DhB4 d8HUYBQG0xIh1PJs051Gkt+BxnkaBcTb7a6T X-Google-Smtp-Source: ABdhPJwxawgAF5OcRU5qQpDoUOvpF3/i/n6TCWI+2S2a97AzFC6QNowHqIO7uI6bGwdPgmJ389RZBA== X-Received: by 2002:a17:906:8c6:: with SMTP id o6mr29342917eje.230.1605197123633; Thu, 12 Nov 2020 08:05:23 -0800 (PST) Received: from atlantis.home ([2a03:1b20:3:f011::6d]) by smtp.gmail.com with ESMTPSA id f25sm2562620edr.53.2020.11.12.08.05.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2020 08:05:23 -0800 (PST) To: gdb-patches@sourceware.org Subject: [PUSHED] arc: Write correct "eret" value during register collection Date: Thu, 12 Nov 2020 17:05:20 +0100 Message-Id: <20201112160520.20364-1-shahab.vahedi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201112134310.8544-1-shahab.vahedi@gmail.com> References: <20201112134310.8544-1-shahab.vahedi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Shahab Vahedi via Gdb-patches Reply-To: Shahab Vahedi Cc: Shahab Vahedi , Shahab Vahedi , Tom Tromey , Francois Bedard Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" From: Shahab Vahedi In collect_register() function of arc-linux-tdep.c, the "eret" (exception return) register value was not being reported correctly. This patch fixes that. Background: When asked for the "pc" value, we have to update the "eret" register with GDB's STOP_PC. The "eret" instructs the kernel code where to jump back when an instruction has stopped due to a breakpoint. This is how collect_register() was doing so: --------------8<-------------- if (regnum == gdbarch_pc_regnum (gdbarch)) regnum = ARC_ERET_REGNUM; regcache->raw_collect (regnum, buf + arc_linux_core_reg_offsets[regnum]); -------------->8-------------- Root cause: Although this is using the correct offset (ERET register's), it is also changing the REGNUM itself. Therefore, raw_collect (regnum, ...) is not reading from "pc" anymore. v2: - Fix a copy/paste issue as rightfully addressed by Tom [1]. [1] https://sourceware.org/pipermail/gdb-patches/2020-November/173208.html gdb/ChangeLog: * arc-linux-tdep.c (collect_register): Populate "eret" by "pc" value from the regcache when asked for "pc" value. --- gdb/ChangeLog | 5 +++++ gdb/arc-linux-tdep.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 038d45f4ec4..4d1f5241e8c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-11-12 Shahab Vahedi + + * arc-linux-tdep.c (collect_register): Populate "eret" by + "pc" value from the regcache when asked for "pc" value. + 2020-11-12 Tom Tromey PR rust/26799: diff --git a/gdb/arc-linux-tdep.c b/gdb/arc-linux-tdep.c index 9ff5f1214a1..6e74bae8056 100644 --- a/gdb/arc-linux-tdep.c +++ b/gdb/arc-linux-tdep.c @@ -319,8 +319,10 @@ static void collect_register (const struct regcache *regcache, struct gdbarch *gdbarch, int regnum, gdb_byte *buf) { + int offset; + /* Skip non-existing registers. */ - if ((arc_linux_core_reg_offsets[regnum] == ARC_OFFSET_NO_REGISTER)) + if (arc_linux_core_reg_offsets[regnum] == ARC_OFFSET_NO_REGISTER) return; /* The address where the execution has stopped is in pseudo-register @@ -332,8 +334,10 @@ collect_register (const struct regcache *regcache, struct gdbarch *gdbarch, the program will continue at the address after the current instruction. */ if (regnum == gdbarch_pc_regnum (gdbarch)) - regnum = ARC_ERET_REGNUM; - regcache->raw_collect (regnum, buf + arc_linux_core_reg_offsets[regnum]); + offset = arc_linux_core_reg_offsets[ARC_ERET_REGNUM]; + else + offset = arc_linux_core_reg_offsets[regnum]; + regcache->raw_collect (regnum, buf + offset); } void -- 2.29.2