Commit 21325631 authored by Matt Redfearn's avatar Matt Redfearn Committed by James Hogan

MIPS: memset.S: Reinstate delay slot indentation

Assembly language within the MIPS kernel conventionally indents
instructions which are in a branch delay slot to make them easier to
see. Commit 8483b14a ("MIPS: lib: memset: Whitespace fixes") rather
inexplicably removed all of these indentations from memset.S. Reinstate
the convention for all instructions in a branch delay slot. This
effectively reverts the above commit, plus other locations introduced
with MIPSR6 support.
Signed-off-by: default avatarMatt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/19111/Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent 84002c88
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
sltiu t0, a2, STORSIZE /* very small region? */ sltiu t0, a2, STORSIZE /* very small region? */
bnez t0, .Lsmall_memset\@ bnez t0, .Lsmall_memset\@
andi t0, a0, STORMASK /* aligned? */ andi t0, a0, STORMASK /* aligned? */
#ifdef CONFIG_CPU_MICROMIPS #ifdef CONFIG_CPU_MICROMIPS
move t8, a1 /* used by 'swp' instruction */ move t8, a1 /* used by 'swp' instruction */
...@@ -103,12 +103,12 @@ ...@@ -103,12 +103,12 @@
#endif #endif
#ifndef CONFIG_CPU_DADDI_WORKAROUNDS #ifndef CONFIG_CPU_DADDI_WORKAROUNDS
beqz t0, 1f beqz t0, 1f
PTR_SUBU t0, STORSIZE /* alignment in bytes */ PTR_SUBU t0, STORSIZE /* alignment in bytes */
#else #else
.set noat .set noat
li AT, STORSIZE li AT, STORSIZE
beqz t0, 1f beqz t0, 1f
PTR_SUBU t0, AT /* alignment in bytes */ PTR_SUBU t0, AT /* alignment in bytes */
.set at .set at
#endif #endif
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
1: ori t1, a2, 0x3f /* # of full blocks */ 1: ori t1, a2, 0x3f /* # of full blocks */
xori t1, 0x3f xori t1, 0x3f
beqz t1, .Lmemset_partial\@ /* no block to fill */ beqz t1, .Lmemset_partial\@ /* no block to fill */
andi t0, a2, 0x40-STORSIZE andi t0, a2, 0x40-STORSIZE
PTR_ADDU t1, a0 /* end address */ PTR_ADDU t1, a0 /* end address */
.set reorder .set reorder
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
.set at .set at
#endif #endif
jr t1 jr t1
PTR_ADDU a0, t0 /* dest ptr */ PTR_ADDU a0, t0 /* dest ptr */
.set push .set push
.set noreorder .set noreorder
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
beqz a2, 1f beqz a2, 1f
#ifndef CONFIG_CPU_MIPSR6 #ifndef CONFIG_CPU_MIPSR6
PTR_ADDU a0, a2 /* What's left */ PTR_ADDU a0, a2 /* What's left */
R10KCBARRIER(0(ra)) R10KCBARRIER(0(ra))
#ifdef __MIPSEB__ #ifdef __MIPSEB__
EX(LONG_S_R, a1, -1(a0), .Llast_fixup\@) EX(LONG_S_R, a1, -1(a0), .Llast_fixup\@)
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
EX(LONG_S_L, a1, -1(a0), .Llast_fixup\@) EX(LONG_S_L, a1, -1(a0), .Llast_fixup\@)
#endif #endif
#else #else
PTR_SUBU t0, $0, a2 PTR_SUBU t0, $0, a2
PTR_ADDIU t0, 1 PTR_ADDIU t0, 1
STORE_BYTE(0) STORE_BYTE(0)
STORE_BYTE(1) STORE_BYTE(1)
...@@ -210,11 +210,11 @@ ...@@ -210,11 +210,11 @@
0: 0:
#endif #endif
1: jr ra 1: jr ra
move a2, zero move a2, zero
.Lsmall_memset\@: .Lsmall_memset\@:
beqz a2, 2f beqz a2, 2f
PTR_ADDU t1, a0, a2 PTR_ADDU t1, a0, a2
1: PTR_ADDIU a0, 1 /* fill bytewise */ 1: PTR_ADDIU a0, 1 /* fill bytewise */
R10KCBARRIER(0(ra)) R10KCBARRIER(0(ra))
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
EX(sb, a1, -1(a0), .Lsmall_fixup\@) EX(sb, a1, -1(a0), .Lsmall_fixup\@)
2: jr ra /* done */ 2: jr ra /* done */
move a2, zero move a2, zero
.if __memset == 1 .if __memset == 1
END(memset) END(memset)
.set __memset, 0 .set __memset, 0
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
.Lfirst_fixup\@: .Lfirst_fixup\@:
jr ra jr ra
nop nop
.Lfwd_fixup\@: .Lfwd_fixup\@:
PTR_L t0, TI_TASK($28) PTR_L t0, TI_TASK($28)
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
LONG_L t0, THREAD_BUADDR(t0) LONG_L t0, THREAD_BUADDR(t0)
LONG_ADDU a2, t1 LONG_ADDU a2, t1
jr ra jr ra
LONG_SUBU a2, t0 LONG_SUBU a2, t0
.Lpartial_fixup\@: .Lpartial_fixup\@:
PTR_L t0, TI_TASK($28) PTR_L t0, TI_TASK($28)
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
LONG_L t0, THREAD_BUADDR(t0) LONG_L t0, THREAD_BUADDR(t0)
LONG_ADDU a2, a0 LONG_ADDU a2, a0
jr ra jr ra
LONG_SUBU a2, t0 LONG_SUBU a2, t0
.Llast_fixup\@: .Llast_fixup\@:
jr ra jr ra
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
LEAF(memset) LEAF(memset)
EXPORT_SYMBOL(memset) EXPORT_SYMBOL(memset)
beqz a1, 1f beqz a1, 1f
move v0, a0 /* result */ move v0, a0 /* result */
andi a1, 0xff /* spread fillword */ andi a1, 0xff /* spread fillword */
LONG_SLL t1, a1, 8 LONG_SLL t1, a1, 8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment