From nobody Wed Sep 13 19:36:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rm9gC5WdWz4t6pw; Wed, 13 Sep 2023 19:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rm9gC4zLZz3JGF; Wed, 13 Sep 2023 19:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694633783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNtYsbotukqwiCbYWR8xcLsvko1tSCTKvnc1BV6rrwA=; b=RdT5LmdeD1rT12wRiOKMm3rYv7gXQgSg69c4cvaAQyhMvrj6rP8X7eV73CHZRFRTjOOSq0 Z9Wzee+DheuW8fsaiP+iTleXYsIs8kQoFfB+guqTwbzeE9bt3QfSzUJrlMfpLpl1asA46m x37f0KRc6zvx7gsdi0GP8FEAIwvsywOAuapfqkxd5ZDQUEREIz3Xadx1nLrmY+mqQ4Vnlk l/v/tnFwCckxIiE6fENqhP8hlbzfAEGeUEG+PplN82vU1Cw8RaPtFddDjjOBwCN9VUqKCo BVowHc3iYAccFAmyJijSbZk226wuLet+qihphBzu9fWohfE1P+vCau9NGvWoAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694633783; a=rsa-sha256; cv=none; b=qYr24Jg7uo8WhtNicK7zoLo516RGe6GgtCvaW34Xvq7TO9V8+0lAkvq815R05AxV5fdpyW mC9foKYQzU2nQiI+To6U1VWrS4VPf7BI1OcYLxxJvjPeiqO6Se+jidKyZBathLeXAfxbYS jWoxeTEYBhEjib+1L4osf/cvyN0ui84UBNIl3KWzegIaU6/vp/r+QHsZE/mEAVx9s13LNx XK4MOYM7Moq+6eakwovspMo94WPRmu4QgjNYzzrtpb7S02I8cc+4YSBrr91nSc0s1oy9cL R3+Qa1yE8qKzQEVINt3it1pZgjCkPBzofnQcvu8McX9PmByYH2LqNop4e7mDCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694633783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gNtYsbotukqwiCbYWR8xcLsvko1tSCTKvnc1BV6rrwA=; b=YTiCI0Xa7HzVwWZGN35o77jWC+PFfOsAy59sdOuxWanfZpInQSQdWHQA8QENAAHtD8qaB8 C4hvugBGYN80HQREGH5KhLMvFZ45oy0wVaKhjqHQOAarQUHsgHiDSX/ShqHnkRk+FWe806 Z9+PRywCobXM5uDmBMhfBvHQOABr/DIvWNEUiokV1NcVUns0FnsaAjjdcNjRJiJ3mDAKGq C6BDSqfz06fjhbqTxmF4owgSpRscKpDaDAqAkydnctpGHAUz7ah473PPUtQclhusi1twUb uBssGGPzxa9E7IiDm+Qn3S3TV1ag0UHKSkJP9XUWWpGEmWBwPDOFfMzg2LX4iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rm9gC438tzC85; Wed, 13 Sep 2023 19:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38DJaNPZ046707; Wed, 13 Sep 2023 19:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38DJaN5Q046704; Wed, 13 Sep 2023 19:36:23 GMT (envelope-from git) Date: Wed, 13 Sep 2023 19:36:23 GMT Message-Id: <202309131936.38DJaN5Q046704@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kyle Evans Subject: git: e9b334d7c383 - 2023Q3 - devel/gdb: kgdb: fix aarch64 trapframe handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: e9b334d7c3830f251e30b875efd56ab414db235a Auto-Submitted: auto-generated The branch 2023Q3 has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9b334d7c3830f251e30b875efd56ab414db235a commit e9b334d7c3830f251e30b875efd56ab414db235a Author: Kyle Evans AuthorDate: 2023-09-13 15:34:07 +0000 Commit: Kyle Evans CommitDate: 2023-09-13 19:36:08 +0000 devel/gdb: kgdb: fix aarch64 trapframe handling regcache_map_entry_size() doesn't do the magic to convert size == 0 to register_size, so we must supply sizes for all registers if we're going to use it. This fixes handling of the trapframe so that we can actually unwind properly, where-as before we would end up with, e.g., #6 0xffff0000004b4860 in kdb_trap (type=60, code=0, tf=) at /usr/src/sys/kern/subr_kdb.c:790 #7 #8 #9 #10 #11 Reported by: Mark Millard Approved by: jhb (implicit, kgdb maintainer) (cherry picked from commit a22f1db084fb50880a0df90f9a0f031a7fc34921) --- devel/gdb/Makefile | 2 +- devel/gdb/files/kgdb/aarch64-fbsd-kern.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 59c460983028..78dfb9f91f0f 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,6 +1,6 @@ PORTNAME= gdb DISTVERSION= 13.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= GNU diff --git a/devel/gdb/files/kgdb/aarch64-fbsd-kern.c b/devel/gdb/files/kgdb/aarch64-fbsd-kern.c index 4d813c786b52..68b12130fa83 100644 --- a/devel/gdb/files/kgdb/aarch64-fbsd-kern.c +++ b/devel/gdb/files/kgdb/aarch64-fbsd-kern.c @@ -126,13 +126,13 @@ aarch64_fbsd_supply_pcb(struct regcache *regcache, CORE_ADDR pcb_addr) static const struct regcache_map_entry aarch64_fbsd_trapframe_map[] = { - { 1, AARCH64_SP_REGNUM, 0 }, - { 1, AARCH64_LR_REGNUM, 0 }, - { 1, AARCH64_PC_REGNUM, 0 }, - { 1, AARCH64_CPSR_REGNUM, 0 }, + { 1, AARCH64_SP_REGNUM, 8 }, + { 1, AARCH64_LR_REGNUM, 8 }, + { 1, AARCH64_PC_REGNUM, 8 }, + { 1, AARCH64_CPSR_REGNUM, 8 }, { 1, REGCACHE_MAP_SKIP, 8 }, /* esr */ { 1, REGCACHE_MAP_SKIP, 8 }, /* far */ - { 30, AARCH64_X0_REGNUM, 0 }, /* x0 ... x29 */ + { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ { 0 }, }; @@ -141,12 +141,12 @@ static const struct regcache_map_entry aarch64_fbsd_trapframe_map[] = static const struct regcache_map_entry aarch64_fbsd13_trapframe_map[] = { - { 1, AARCH64_SP_REGNUM, 0 }, - { 1, AARCH64_LR_REGNUM, 0 }, - { 1, AARCH64_PC_REGNUM, 0 }, + { 1, AARCH64_SP_REGNUM, 8 }, + { 1, AARCH64_LR_REGNUM, 8 }, + { 1, AARCH64_PC_REGNUM, 8 }, { 1, AARCH64_CPSR_REGNUM, 4 }, { 1, REGCACHE_MAP_SKIP, 4 }, /* esr */ - { 30, AARCH64_X0_REGNUM, 0 }, /* x0 ... x29 */ + { 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */ { 0 }, };