8cb6e17571
Looking at the ARM disassembler output, every comment seems to start
with a ';' character, so I assumed this was the correct character to
start an assembler comment.
I then spotted a couple of places where there was no ';', but instead,
just a '@' character. I thought that this was a case of a missing
';', and proposed a patch to add the missing ';' characters.
Turns out I was wrong, '@' is actually the ARM assembler comment
character, while ';' is the statement separator. Thus this:
nop ;@ comment
is two statements, the first is the 'nop' instruction, while the
second contains no instructions, just the '@ comment' comment text.
This:
nop @ comment
is a single 'nop' instruction followed by a comment. And finally,
this:
nop ; comment
is two statements, the first contains the 'nop' instruction, while the
second contains the instruction 'comment', which obviously isn't
actually an instruction at all.
Why this matters is that, in the next commit, I would like to add
libopcodes syntax styling support for ARM.
The question then is how should the disassembler style the three cases
above?
As '@' is the actual comment start character then clearly the '@' and
anything after it can be styled as a comment. But what about ';' in
the second example? Style as text? Style as a comment?
And the third example is even harder, what about the 'comment' text?
Style as an instruction mnemonic? Style as text? Style as a comment?
I think the only sensible answer is to move the disassembler to use
'@' consistently as its comment character, and remove all the uses of
';'.
Then, in the next commit, it's obvious what to do.
There's obviously a *lot* of tests that get updated by this commit,
the only actual code changes are in opcodes/arm-dis.c.
34 lines
1.0 KiB
Makefile
34 lines
1.0 KiB
Makefile
|
|
.*: file format elf32-.*arm
|
|
architecture: arm.*, flags 0x00000150:
|
|
HAS_SYMS, DYNAMIC, D_PAGED
|
|
start address 0x.*
|
|
|
|
Disassembly of section .plt:
|
|
|
|
[0-9a-f]+ <.plt>:
|
|
[0-9a-f]+: e52de004 push {lr} @ .*
|
|
[0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] @ 8128 .*
|
|
[0-9a-f]+: e08fe00e add lr, pc, lr
|
|
[0-9a-f]+: e5bef008 ldr pc, \[lr, #8\]!
|
|
8128: 000080cc .word 0x000080cc
|
|
812c: e08e0000 add r0, lr, r0
|
|
[0-9a-f]+: e5901004 ldr r1, \[r0, #4\]
|
|
[0-9a-f]+: e12fff11 bx r1
|
|
[0-9a-f]+: e52d2004 push {r2} @ .*
|
|
813c: e59f200c ldr r2, \[pc, #12\] @ 8150 .*
|
|
[0-9a-f]+: e59f100c ldr r1, \[pc, #12\] @ 8154 .*
|
|
[0-9a-f]+: e79f2002 ldr r2, \[pc, r2\]
|
|
[0-9a-f]+: e081100f add r1, r1, pc
|
|
[0-9a-f]+: e12fff12 bx r2
|
|
8150: 000080bc .word 0x000080bc
|
|
8154: 000080a4 .word 0x000080a4
|
|
|
|
Disassembly of section .text:
|
|
|
|
[0-9a-f]+ <foo>:
|
|
[0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] @ 8164 .*
|
|
[0-9a-f]+: fafffff2 blx 812c <.*>
|
|
[0-9a-f]+: e1a00000 nop @ .*
|
|
8164: 000080a0 .word 0x000080a0
|