summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-07-30 15:58:56 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-07-30 15:58:56 +0000
commita5d1f4e1f0b5f9bc5faebcd9323dda5464c9f933 (patch)
tree4ff7e06a7b6cb675403c62e28d70889d951c83d6
parent7da2df4b4bf94c31bef809a64e94b7db516c60d7 (diff)
downloadrockbox-a5d1f4e1f0b5f9bc5faebcd9323dda5464c9f933.tar.gz
rockbox-a5d1f4e1f0b5f9bc5faebcd9323dda5464c9f933.tar.bz2
rockbox-a5d1f4e1f0b5f9bc5faebcd9323dda5464c9f933.zip
Commit FS#9102 thanks to Martin Pahl
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18154 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--utils/disassembler/arm/disasm_arm.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index 8afe5549af..9ee7898c07 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -401,6 +401,7 @@ Thibaut Girka
Rasmus Ry
William Poetra Yoga Hadisoeseno
Adrian Osoianu
+Martin Pahl
The libmad team
The wavpack team
diff --git a/utils/disassembler/arm/disasm_arm.c b/utils/disassembler/arm/disasm_arm.c
index aa04ab6265..b23c6b0355 100644
--- a/utils/disassembler/arm/disasm_arm.c
+++ b/utils/disassembler/arm/disasm_arm.c
@@ -364,7 +364,10 @@ void block_data(char *stg, ULONG val)
for(i=0; i<16; i++)
if(val & (1<<i))
sprintf(lst+strlen(lst), "%s, ", regs[i]);
- strcpy(lst+strlen(lst)-2, "}");
+ if(strlen(lst)>2)
+ strcpy(lst+strlen(lst)-2, "}");
+ else
+ strcpy(lst+strlen(lst), "}");
if(val & 0x400000) // load psr or force user mode
strcpy(lst+strlen(lst), "^");