diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2007-08-01 22:17:36 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2007-08-01 22:17:36 +0000 |
commit | 0b8dd125c3744fbfd4b3162de7882f5dd60f5e0a (patch) | |
tree | 511d76f2b39763b4689e3fd713b69c366e8f1264 /utils | |
parent | 307d2ddce98ef81f5cd3e5e1f24a7ddada60c486 (diff) | |
download | rockbox-0b8dd125c3744fbfd4b3162de7882f5dd60f5e0a.tar.gz rockbox-0b8dd125c3744fbfd4b3162de7882f5dd60f5e0a.zip |
FS#7182: Initial attempt by Dave Chapman at getting ARM disassembler to compile in Linux.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14127 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r-- | utils/disassembler/arm/Makefile | 26 | ||||
-rw-r--r-- | utils/disassembler/arm/disasm_arm.c | 3 | ||||
-rw-r--r-- | utils/disassembler/arm/main.c | 6 |
3 files changed, 31 insertions, 4 deletions
diff --git a/utils/disassembler/arm/Makefile b/utils/disassembler/arm/Makefile new file mode 100644 index 0000000000..786325e27d --- /dev/null +++ b/utils/disassembler/arm/Makefile @@ -0,0 +1,26 @@ +CFLAGS = -Wall + +ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) +OUTPUT=arm_disass.exe +CROSS= +CFLAGS+=-mno-cygwin +else +OUTPUT=arm_disass +CROSS=i586-mingw32msvc- +endif + +NATIVECC = gcc +CC = $(CROSS)gcc + +all: $(OUTPUT) + +arm_disass: main.c disasm_arm.c + gcc $(CFLAGS) -o arm_disass main.c disasm_arm.c + strip arm_disass + +arm_disass.exe: main.c disasm_arm.c + $(CC) $(CFLAGS) -o arm_disass.exe main.c disasm_arm.c + $(CROSS)strip arm_disass.exe + +clean: + rm -f arm_disass main.o disasm_arm.o *~ diff --git a/utils/disassembler/arm/disasm_arm.c b/utils/disassembler/arm/disasm_arm.c index 4664d0f3b2..631eb9d7db 100644 --- a/utils/disassembler/arm/disasm_arm.c +++ b/utils/disassembler/arm/disasm_arm.c @@ -1,5 +1,6 @@ #include <stdio.h>
#include <string.h>
+#include <stdint.h>
#define ULONG unsigned long
#define UCHAR unsigned char
@@ -194,7 +195,7 @@ void opcode_stg(char *stg, ULONG val, ULONG off) if(val & 0x2000000) // immidiate
{
- off = (ULONG)((unsigned __int64)(val&0xff) << (32 - 2 * ((val >> 8) & 15))) | ((val&0xff) >> 2 * ((val >> 8) & 15));
+ off = (ULONG)((uint64_t)(val&0xff) << (32 - 2 * ((val >> 8) & 15))) | ((val&0xff) >> 2 * ((val >> 8) & 15));
sprintf(op2, FRMT" ", off);
}
else
diff --git a/utils/disassembler/arm/main.c b/utils/disassembler/arm/main.c index 834dc5ff93..59dad48176 100644 --- a/utils/disassembler/arm/main.c +++ b/utils/disassembler/arm/main.c @@ -10,7 +10,7 @@ ULONG isdata[1000000]; /* each bit defines one byte as: code=0, data=1 */ extern void dis_asm(ULONG off, ULONG val, char *stg);
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
FILE *in, *out;
char *ptr, stg[256];
@@ -20,7 +20,7 @@ void main(int argc, char **argv) if(argc == 1 || strcmp(argv[1], "--help") == 0)
{ printf("Usage: arm_disass [input file]\n");
- printf(" disassembles input file to 'disasm.txt'");
+ printf(" disassembles input file to 'disasm.txt'\n");
exit(-1);
}
@@ -115,4 +115,4 @@ void main(int argc, char **argv) }
fclose(in);
-}
\ No newline at end of file +}
|