diff options
| author | Andy McFadden <fadden@android.com> | 2011-02-11 15:26:10 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2011-02-11 15:42:02 -0800 |
| commit | 750d110b62cef538e193b6f91f5239b0c4b63ef1 (patch) | |
| tree | 2e65a1530ecff3bc55dfd7b757834d7ac9f58fca /libdex | |
| parent | 79cf850f7b9153ab7651a4bee3bdee137a226351 (diff) | |
| download | android_dalvik-750d110b62cef538e193b6f91f5239b0c4b63ef1.tar.gz android_dalvik-750d110b62cef538e193b6f91f5239b0c4b63ef1.tar.bz2 android_dalvik-750d110b62cef538e193b6f91f5239b0c4b63ef1.zip | |
Rename invoke-direct-empty to invoke-object-init
The invoke-direct-empty instruction was introduced to remove the
overhead of calling the empty Object constructor. We now need it
to do some extra work on behalf of object construction, so it's
appropriate to change the instruction name to match the role it
fills rather than the more general role it was hoped to fill.
No functional changes.
Bug 3342343
Change-Id: I65dd6a2c00c99581c9a19b16fe193b70642c8fbb
Diffstat (limited to 'libdex')
| -rw-r--r-- | libdex/DexOpcodes.c | 2 | ||||
| -rw-r--r-- | libdex/DexOpcodes.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libdex/DexOpcodes.c b/libdex/DexOpcodes.c index 869e63e31..ae4e2d167 100644 --- a/libdex/DexOpcodes.c +++ b/libdex/DexOpcodes.c @@ -270,7 +270,7 @@ static const char* gOpNames[kNumPackedOpcodes] = { "^throw-verification-error", "+execute-inline", "+execute-inline/range", - "+invoke-direct-empty", + "+invoke-object-init", "+return-void-barrier", "+iget-quick", "+iget-wide-quick", diff --git a/libdex/DexOpcodes.h b/libdex/DexOpcodes.h index b8d4cb0de..c1e9d0d8b 100644 --- a/libdex/DexOpcodes.h +++ b/libdex/DexOpcodes.h @@ -308,7 +308,7 @@ typedef enum Opcode { OP_THROW_VERIFICATION_ERROR = 0xed, OP_EXECUTE_INLINE = 0xee, OP_EXECUTE_INLINE_RANGE = 0xef, - OP_INVOKE_DIRECT_EMPTY = 0xf0, + OP_INVOKE_OBJECT_INIT = 0xf0, OP_RETURN_VOID_BARRIER = 0xf1, OP_IGET_QUICK = 0xf2, OP_IGET_WIDE_QUICK = 0xf3, @@ -830,7 +830,7 @@ typedef enum Opcode { H(OP_THROW_VERIFICATION_ERROR), \ H(OP_EXECUTE_INLINE), \ H(OP_EXECUTE_INLINE_RANGE), \ - H(OP_INVOKE_DIRECT_EMPTY), \ + H(OP_INVOKE_OBJECT_INIT), \ H(OP_RETURN_VOID_BARRIER), \ H(OP_IGET_QUICK), \ H(OP_IGET_WIDE_QUICK), \ |