diff options
| author | Chris Dearman <chris@mips.com> | 2012-01-30 17:44:28 -0800 |
|---|---|---|
| committer | Raghu Gandham <raghu@mips.com> | 2012-02-15 11:02:48 -0800 |
| commit | 46f3fd49ebda372887192fa32b16040ed6710f58 (patch) | |
| tree | 426082204948350d1b96919058cc3841ed79d41c /vm/mterp | |
| parent | 75425b731c514bf90c985275d80aa7886727d83f (diff) | |
| download | android_dalvik-46f3fd49ebda372887192fa32b16040ed6710f58.tar.gz android_dalvik-46f3fd49ebda372887192fa32b16040ed6710f58.tar.bz2 android_dalvik-46f3fd49ebda372887192fa32b16040ed6710f58.zip | |
Fix instruction logging messages
Change-Id: Ifc7de30ea1c1221f7838523a5ebd269eec622e03
Signed-off-by: Chris Dearman <chris@mips.com>
Diffstat (limited to 'vm/mterp')
| -rw-r--r-- | vm/mterp/c/OP_PACKED_SWITCH.cpp | 2 | ||||
| -rw-r--r-- | vm/mterp/c/OP_SPARSE_SWITCH.cpp | 2 | ||||
| -rw-r--r-- | vm/mterp/c/opcommon.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-allstubs.cpp | 20 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-armv5te-vfp.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-armv5te.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-armv7-a-neon.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-armv7-a.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-portable.cpp | 20 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-x86-atom.cpp | 16 | ||||
| -rw-r--r-- | vm/mterp/out/InterpC-x86.cpp | 16 |
11 files changed, 78 insertions, 78 deletions
diff --git a/vm/mterp/c/OP_PACKED_SWITCH.cpp b/vm/mterp/c/OP_PACKED_SWITCH.cpp index 3922e46e5..c820e8028 100644 --- a/vm/mterp/c/OP_PACKED_SWITCH.cpp +++ b/vm/mterp/c/OP_PACKED_SWITCH.cpp @@ -6,7 +6,7 @@ HANDLE_OPCODE(OP_PACKED_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|packed-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|packed-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || diff --git a/vm/mterp/c/OP_SPARSE_SWITCH.cpp b/vm/mterp/c/OP_SPARSE_SWITCH.cpp index f48d06e50..9ca16ad7a 100644 --- a/vm/mterp/c/OP_SPARSE_SWITCH.cpp +++ b/vm/mterp/c/OP_SPARSE_SWITCH.cpp @@ -6,7 +6,7 @@ HANDLE_OPCODE(OP_SPARSE_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|sparse-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|sparse-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || diff --git a/vm/mterp/c/opcommon.cpp b/vm/mterp/c/opcommon.cpp index 104d8569f..f2e0ecbfe 100644 --- a/vm/mterp/c/opcommon.cpp +++ b/vm/mterp/c/opcommon.cpp @@ -525,7 +525,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -552,7 +552,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -596,7 +596,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -623,7 +623,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -673,7 +673,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -696,7 +696,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -719,7 +719,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -742,6 +742,6 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-allstubs.cpp b/vm/mterp/out/InterpC-allstubs.cpp index fac5ef7c3..fa24bc327 100644 --- a/vm/mterp/out/InterpC-allstubs.cpp +++ b/vm/mterp/out/InterpC-allstubs.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1934,7 +1934,7 @@ HANDLE_OPCODE(OP_PACKED_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|packed-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|packed-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || @@ -1965,7 +1965,7 @@ HANDLE_OPCODE(OP_SPARSE_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|sparse-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|sparse-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || diff --git a/vm/mterp/out/InterpC-armv5te-vfp.cpp b/vm/mterp/out/InterpC-armv5te-vfp.cpp index 28f72b338..2d66aad80 100644 --- a/vm/mterp/out/InterpC-armv5te-vfp.cpp +++ b/vm/mterp/out/InterpC-armv5te-vfp.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-armv5te.cpp b/vm/mterp/out/InterpC-armv5te.cpp index fd9b000e7..878d56889 100644 --- a/vm/mterp/out/InterpC-armv5te.cpp +++ b/vm/mterp/out/InterpC-armv5te.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-armv7-a-neon.cpp b/vm/mterp/out/InterpC-armv7-a-neon.cpp index 25404d43e..c55dfc0f1 100644 --- a/vm/mterp/out/InterpC-armv7-a-neon.cpp +++ b/vm/mterp/out/InterpC-armv7-a-neon.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-armv7-a.cpp b/vm/mterp/out/InterpC-armv7-a.cpp index 2cbd5797b..6089a606a 100644 --- a/vm/mterp/out/InterpC-armv7-a.cpp +++ b/vm/mterp/out/InterpC-armv7-a.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-portable.cpp b/vm/mterp/out/InterpC-portable.cpp index d6a23c0c5..dc14c01dd 100644 --- a/vm/mterp/out/InterpC-portable.cpp +++ b/vm/mterp/out/InterpC-portable.cpp @@ -983,7 +983,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1010,7 +1010,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1054,7 +1054,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1081,7 +1081,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1154,7 +1154,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1177,7 +1177,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1200,7 +1200,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1951,7 +1951,7 @@ HANDLE_OPCODE(OP_PACKED_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|packed-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|packed-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || @@ -1982,7 +1982,7 @@ HANDLE_OPCODE(OP_SPARSE_SWITCH /*vAA, +BBBB*/) vsrc1 = INST_AA(inst); offset = FETCH(1) | (((s4) FETCH(2)) << 16); - ILOGV("|sparse-switch v%d +0x%04x", vsrc1, vsrc2); + ILOGV("|sparse-switch v%d +0x%04x", vsrc1, offset); switchData = pc + offset; // offset in 16-bit units #ifndef NDEBUG if (switchData < curMethod->insns || diff --git a/vm/mterp/out/InterpC-x86-atom.cpp b/vm/mterp/out/InterpC-x86-atom.cpp index 1f3c18d4c..e08b0f595 100644 --- a/vm/mterp/out/InterpC-x86-atom.cpp +++ b/vm/mterp/out/InterpC-x86-atom.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); diff --git a/vm/mterp/out/InterpC-x86.cpp b/vm/mterp/out/InterpC-x86.cpp index 53be42f41..3795c6a75 100644 --- a/vm/mterp/out/InterpC-x86.cpp +++ b/vm/mterp/out/InterpC-x86.cpp @@ -1033,7 +1033,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1060,7 +1060,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, \ dvmGetField##_ftype(obj, ifield->byteOffset)); \ - ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IGET '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1104,7 +1104,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1131,7 +1131,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetField##_ftype(obj, ifield->byteOffset, \ GET_REGISTER##_regsize(vdst)); \ - ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name, \ + ILOGV("+ IPUT '%s'=0x%08llx", ifield->name, \ (u8) GET_REGISTER##_regsize(vdst)); \ } \ FINISH(5); @@ -1181,7 +1181,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1204,7 +1204,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield)); \ ILOGV("+ SGET '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); @@ -1227,7 +1227,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(2); @@ -1250,7 +1250,7 @@ GOTO_TARGET_DECL(exceptionThrown); } \ dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst)); \ ILOGV("+ SPUT '%s'=0x%08llx", \ - sfield->field.name, (u8)GET_REGISTER##_regsize(vdst)); \ + sfield->name, (u8)GET_REGISTER##_regsize(vdst)); \ } \ FINISH(4); |