diff options
| author | Sasha Levitskiy <sanek@google.com> | 2014-04-11 23:54:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-11 23:54:05 +0000 |
| commit | 835526fdc035cad6d712a7098d0eae37b3995d2c (patch) | |
| tree | a430a147ff40a82058ac8316be127dab59d6f4fc /libpixelflinger | |
| parent | 2f365509eb8a3696feb8063ba8e17ebd12beb7ff (diff) | |
| parent | cdc1cfb3e51f3caddc1f290b46dc789c036f22ed (diff) | |
| download | system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.zip system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.tar.gz system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.tar.bz2 | |
Merge "Cleanup: warning fixit."
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/codeflinger/disassem.c | 15 | ||||
| -rw-r--r-- | libpixelflinger/codeflinger/disassem.h | 4 |
2 files changed, 7 insertions, 12 deletions
diff --git a/libpixelflinger/codeflinger/disassem.c b/libpixelflinger/codeflinger/disassem.c index aeb8034..39dd614 100644 --- a/libpixelflinger/codeflinger/disassem.c +++ b/libpixelflinger/codeflinger/disassem.c @@ -301,19 +301,14 @@ static u_int disassemble_readword(u_int address); static void disassemble_printaddr(u_int address); u_int -disasm(const disasm_interface_t *di, u_int loc, int altfmt) +disasm(const disasm_interface_t *di, u_int loc, int __unused altfmt) { const struct arm32_insn *i_ptr = &arm32_i[0]; - - u_int insn; - int matchp; + u_int insn = di->di_readword(loc); + int matchp = 0; int branch; char* f_ptr; - int fmt; - - fmt = 0; - matchp = 0; - insn = di->di_readword(loc); + int fmt = 0; /* di->di_printf("loc=%08x insn=%08x : ", loc, insn);*/ @@ -670,7 +665,7 @@ disasm_insn_ldrhstrh(const disasm_interface_t *di, u_int insn, u_int loc) } static void -disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int loc) +disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int __unused loc) { if (((insn >> 8) & 0xf) == 1) di->di_printf("f%d, ", (insn >> 12) & 0x07); diff --git a/libpixelflinger/codeflinger/disassem.h b/libpixelflinger/codeflinger/disassem.h index 02747cd..c7c60b6 100644 --- a/libpixelflinger/codeflinger/disassem.h +++ b/libpixelflinger/codeflinger/disassem.h @@ -49,8 +49,8 @@ extern "C" { typedef struct { u_int (*di_readword)(u_int); - void (*di_printaddr)(u_int); - void (*di_printf)(const char *, ...); + void (*di_printaddr)(u_int); + int (*di_printf)(const char *, ...); } disasm_interface_t; /* Prototypes for callable functions */ |