diff options
| author | Martin Storsjö <martin@martin.st> | 2019-04-03 14:57:13 +0300 |
|---|---|---|
| committer | Janne Grunau <janne-vlc@jannau.net> | 2019-04-04 21:33:36 +0300 |
| commit | 5d888dde5422d34ff0847ad14352943564f49902 (patch) | |
| tree | b56c37efd9bca0aa830d5897a02cc6ee41628a4b /src/arm/32/util.S | |
| parent | 0d936a1aef07b6b6f950761df9c03c9621f8e206 (diff) | |
arm: Consistently use 8/24 columns indentation for assembly
For cases with indented, nested .if/.macro in asm.S, ident those
by 4 chars.
Some initial assembly files were indented to 4/16 columns, while all
the actual implementation files, starting with src/arm/64/mc.S, have
used 8/24 for indentation.
Diffstat (limited to 'src/arm/32/util.S')
| -rw-r--r-- | src/arm/32/util.S | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/arm/32/util.S b/src/arm/32/util.S index 02d763c..0521ef2 100644 --- a/src/arm/32/util.S +++ b/src/arm/32/util.S @@ -34,32 +34,32 @@ .macro movrel rd, val, offset=0 #if defined(PIC) && defined(__APPLE__) - ldr \rd, 1f - b 2f + ldr \rd, 1f + b 2f 1: - .word 3f - (2f + 8 - 4 * CONFIG_THUMB) + .word 3f - (2f + 8 - 4 * CONFIG_THUMB) 2: - ldr \rd, [pc, \rd] + ldr \rd, [pc, \rd] .if \offset < 0 - sub \rd, \rd, #-(\offset) + sub \rd, \rd, #-(\offset) .elseif \offset > 0 - add \rd, \rd, #\offset + add \rd, \rd, #\offset .endif - .non_lazy_symbol_pointer + .non_lazy_symbol_pointer 3: - .indirect_symbol \val - .word 0 - .text + .indirect_symbol \val + .word 0 + .text #elif defined(PIC) - ldr \rd, 1f - b 2f + ldr \rd, 1f + b 2f 1: - .word \val + \offset - (2f + 8 - 4 * CONFIG_THUMB) + .word \val + \offset - (2f + 8 - 4 * CONFIG_THUMB) 2: - add \rd, \rd, pc + add \rd, \rd, pc #else - movw \rd, #:lower16:\val+\offset - movt \rd, #:upper16:\val+\offset + movw \rd, #:lower16:\val+\offset + movt \rd, #:upper16:\val+\offset #endif .endm |