From nobody Tue Dec 14 11:07:24 2021 X-Original-To: dev-commits-src-branches@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 81E0F18DDA28; Tue, 14 Dec 2021 11:07:26 +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 4JCwZP3VfTz3Nyf; Tue, 14 Dec 2021 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1257F26D63; Tue, 14 Dec 2021 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEB7OQC040300; Tue, 14 Dec 2021 11:07:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEB7O2x040299; Tue, 14 Dec 2021 11:07:24 GMT (envelope-from git) Date: Tue, 14 Dec 2021 11:07:24 GMT Message-Id: <202112141107.1BEB7O2x040299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 9b87a3a65ac6 - stable/13 - Print the correct register for the arm64 elr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b87a3a65ac6e204e503085a8654c0d53867455b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639480045; 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=bOp4JfoOtVpTjiUnNsy+Q9ng47JL6JkAzHF+apRV53g=; b=mPRW1LpUVLaVUef6XhBQhUnqewgDTJoOy/XHYoShnqPto3F78kk4GexryqckQ/MmApoljf r3ydtHxHA+TRaAFeBi4mQUl+pamCjnSP0XFRptbkhQdQpdEJnfyzlouPS14SS5rYhkED4t tlRbb/MVB3DjHuKrqVentFGBrWC74bgoxdJvm9vEVMyY3YvuaR+kNI2cW1VmlXZgCk8ZJr xwv0+yW/KbCMxnhuVjsMsRspMfWdyYHhdVrRjwKiMJQFL0G1KcLsW/APxPP6ZGn63xLdqa ZmlVg8524B5GqOEcBSYPs7fgZf18rM8ElUTfweCZHBZ746XzERrsHaZ0VnukiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639480045; a=rsa-sha256; cv=none; b=dKbIgHjFviRt6eqLxLsDCcKf+qIDYv0zb2996rabUPT0yjpm6wGH3Cc+5TS3IxBgoejTay w66Zmgksvrphevbk6nzE2j3t141z90aayQxCEFwk68XNPwNpx/CDZkbhp346IDuIpTVCUZ +1NVPgKS0CFDkM1790lsXTI6j2a2INvf43hywU4KUj6nkyTyclae5FEWeQttqprZki6oPl fORUvPmvrxImj2B1vRRg3/lODlo8NMxJaPSGKNTTMAO+oGt9eykVcn9uYG33D4drsIp/BP PWgt7zOnT31D04M4tLrI0Ogn4QbTxMVFnrrpbu+m/7c2byGcXl/FDR0/jH+TGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9b87a3a65ac6e204e503085a8654c0d53867455b commit 9b87a3a65ac6e204e503085a8654c0d53867455b Author: Andrew Turner AuthorDate: 2021-11-01 11:19:57 +0000 Commit: Andrew Turner CommitDate: 2021-12-14 10:58:01 +0000 Print the correct register for the arm64 elr In 7ec86b6609912 ("Also print symbols when printing arm64 registers") a new function was created to print most registers. Unfortunately the Link Register (LR) was being printed when we should have printed the Exception Link Register (ELR). Fix this by adding the missing 'e'. Sponsored by: The FreeBSD Foundation (cherry picked from commit 62cbc00d2f57785c747632b1a5ba7571281d17c4) --- sys/arm64/arm64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index a8e016d6bb61..2eee1392ca49 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -397,7 +397,7 @@ print_registers(struct trapframe *frame) } printf(" sp: %16lx\n", frame->tf_sp); print_gp_register(" lr", frame->tf_lr); - print_gp_register("elr", frame->tf_lr); + print_gp_register("elr", frame->tf_elr); printf("spsr: %8x\n", frame->tf_spsr); }