Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Nov 2021 11:27:20 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 62cbc00d2f57 - main - Print the correct register for the arm64 elr
Message-ID:  <202111011127.1A1BRK3d059537@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=62cbc00d2f57785c747632b1a5ba7571281d17c4

commit 62cbc00d2f57785c747632b1a5ba7571281d17c4
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2021-11-01 11:19:57 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2021-11-01 11:19:57 +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
---
 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 c1566b7df492..891f1024232a 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -399,7 +399,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);
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111011127.1A1BRK3d059537>