From: Nick Desaulniers <ndesaulniers@google.com>
To: Nathan Huckleberry <nhuck15@gmail.com>,
Russell King <linux@armlinux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Chunyan Zhang <zhang.lyra@gmail.com>,
clang-built-linux@googlegroups.com,
Dmitry Safonov <0x7f454c46@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org,
Lvqiang Huang <lvqiang.huang@unisoc.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Miles Chen <miles.chen@mediatek.com>
Subject: [PATCH 4/4] ARM: backtrace: use more descriptive labels
Date: Thu, 30 Jul 2020 13:51:12 -0700 [thread overview]
Message-ID: <20200730205112.2099429-5-ndesaulniers@google.com> (raw)
In-Reply-To: <20200730205112.2099429-1-ndesaulniers@google.com>
We don't necessarily need the `b` suffixes used to disambiguate between
non-unique local labels. Give these labels more descriptive names.
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
arch/arm/lib/backtrace.S | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 872f658638d9..138e961ff033 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -37,9 +37,9 @@ ENDPROC(c_backtrace)
THUMB( orreq mask, #0x03 )
movne mask, #0 @ mask for 32-bit
-1: stmfd sp!, {pc} @ calculate offset of PC stored
+store_pc: stmfd sp!, {pc} @ calculate offset of PC stored
ldr r0, [sp], #4 @ by stmfd for this CPU
- adr r1, 1b
+ adr r1, store_pc
sub offset, r0, r1
/*
@@ -60,14 +60,14 @@ ENDPROC(c_backtrace)
for_each_frame: tst frame, mask @ Check for address exceptions
bne no_frame
-1001: ldr sv_pc, [frame, #0] @ get saved pc
-1002: ldr sv_fp, [frame, #-12] @ get saved fp
+load_pc: ldr sv_pc, [frame, #0] @ get saved pc
+load_fp: ldr sv_fp, [frame, #-12] @ get saved fp
sub sv_pc, sv_pc, offset @ Correct PC for prefetching
bic sv_pc, sv_pc, mask @ mask PC/LR for the mode
-1003: ldr r2, [sv_pc, #-4] @ if stmfd sp!, {args} exists,
- ldr r3, .Ldsi+4 @ adjust saved 'pc' back one
+load_stmfd: ldr r2, [sv_pc, #-4] @ if stmfd sp!, {args} exists,
+ ldr r3, .Lopcode + 4 @ adjust saved 'pc' back one
teq r3, r2, lsr #11 @ instruction
subne r0, sv_pc, #4 @ allow for mov
subeq r0, sv_pc, #8 @ allow for mov + stmia
@@ -79,15 +79,15 @@ for_each_frame: tst frame, mask @ Check for address exceptions
bl dump_backtrace_entry
ldr r1, [sv_pc, #-4] @ if stmfd sp!, {args} exists,
- ldr r3, .Ldsi+4
+ ldr r3, .Lopcode + 4
teq r3, r1, lsr #11
ldreq r0, [frame, #-8] @ get sp
subeq r0, r0, #4 @ point at the last arg
mov r2, loglvl
bleq dump_backtrace_stm @ dump saved registers
-1004: ldr r1, [sv_pc, #0] @ if stmfd sp!, {..., fp, ip, lr, pc}
- ldr r3, .Ldsi @ instruction exists,
+reload_stmfd: ldr r1, [sv_pc, #0] @ if stmfd sp!, {..., fp, ip, lr, pc}
+ ldr r3, .Lopcode @ instruction exists,
teq r3, r1, lsr #11
subeq r0, frame, #16
mov r2, loglvl
@@ -100,7 +100,7 @@ for_each_frame: tst frame, mask @ Check for address exceptions
mov frame, sv_fp @ above the current frame
bhi for_each_frame
-1006: adr r0, .Lbad
+bad_frame: adr r0, .Lbad
mov r1, loglvl
mov r2, frame
bl printk
@@ -109,15 +109,15 @@ ENDPROC(c_backtrace)
.pushsection __ex_table,"a"
.align 3
- .long 1001b, 1006b
- .long 1002b, 1006b
- .long 1003b, 1006b
- .long 1004b, 1006b
+ .long load_pc, bad_frame
+ .long load_fp, bad_frame
+ .long load_stmfd, bad_frame
+ .long reload_stmfd, bad_frame
.popsection
.Lbad: .asciz "%sBacktrace aborted due to bad frame pointer <%p>\n"
.align
-.Ldsi: .word 0xe92dd800 >> 11 @ stmfd sp!, {... fp, ip, lr, pc}
+.Lopcode: .word 0xe92dd800 >> 11 @ stmfd sp!, {... fp, ip, lr, pc}
.word 0xe92d0000 >> 11 @ stmfd sp!, {}
#endif
--
2.28.0.163.g6104cc2f0b6-goog
prev parent reply other threads:[~2020-07-30 20:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 20:51 [PATCH 0/4] CONFIG_UNWINDER_FRAME_POINTER fixes+cleanups Nick Desaulniers
2020-07-30 20:51 ` [PATCH 1/4] ARM: backtrace-clang: check for NULL lr Nick Desaulniers
2020-08-07 18:07 ` Nathan Huckleberry
2020-07-30 20:51 ` [PATCH 2/4] ARM: backtrace-clang: add fixup for lr dereference Nick Desaulniers
2020-08-06 22:38 ` Nathan Huckleberry
2020-08-10 22:33 ` Nick Desaulniers
2020-08-20 0:13 ` Nick Desaulniers
2020-07-30 20:51 ` [PATCH 3/4] ARM: backtrace-clang: give labels more descriptive names Nick Desaulniers
2020-08-06 22:39 ` Nathan Huckleberry
2020-08-10 22:32 ` Nick Desaulniers
2020-07-30 20:51 ` Nick Desaulniers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730205112.2099429-5-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=clang-built-linux@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=lvqiang.huang@unisoc.com \
--cc=matthias.bgg@gmail.com \
--cc=miles.chen@mediatek.com \
--cc=nhuck15@gmail.com \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).