diff options
| author | Sasha Levitskiy <sanek@google.com> | 2014-04-12 00:00:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-12 00:00:02 +0000 |
| commit | 43cb7ae6c31ced8cd518eab59dfea31ab1ade812 (patch) | |
| tree | 22f8c327a48e787108fbd09969ef515750fb6013 /libpixelflinger/codeflinger/disassem.c | |
| parent | 7acecec433b396405279c3fa35359636dbcc7d47 (diff) | |
| parent | 4f362e438c6ee5688c4f2f444203ed7acffa566b (diff) | |
| download | system_core-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.zip system_core-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.tar.gz system_core-43cb7ae6c31ced8cd518eab59dfea31ab1ade812.tar.bz2 | |
am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."
* commit '4f362e438c6ee5688c4f2f444203ed7acffa566b':
Cleanup: warning fixit.
Diffstat (limited to 'libpixelflinger/codeflinger/disassem.c')
| -rw-r--r-- | libpixelflinger/codeflinger/disassem.c | 15 |
1 files changed, 5 insertions, 10 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); |