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 /opcode-gen | |
| 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 'opcode-gen')
| -rw-r--r-- | opcode-gen/bytecode.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/opcode-gen/bytecode.txt b/opcode-gen/bytecode.txt index 63bc6fde0..1a2270702 100644 --- a/opcode-gen/bytecode.txt +++ b/opcode-gen/bytecode.txt @@ -328,12 +328,11 @@ op ed ^throw-verification-error 20bc n varies optimized|throw op ee +execute-inline 35mi n inline-method optimized|continue|throw op ef +execute-inline/range 3rmi n inline-method optimized|continue|throw -# This opcode is marked neither as "invoke" nor "throw" since it is -# executed as a nop except if a debugger is attached. And given that -# dexopt would have been the thing that inserted this instruction, -# having already verified the method and the one it (would have) -# called, we know that it couldn't possibly throw. -op f0 +invoke-direct-empty 35c n method-ref optimized|continue +# This opcode is marked neither as "invoke" nor "throw" since it +# doesn't invoke the method unless a debugger is attached. The verifier +# will ensure that Object.<init> is present and empty, so there is no +# opportunity for an exception to be thrown. +op f0 +invoke-object-init 35c n method-ref optimized|continue op f1 +return-void-barrier 10x n none optimized|return op f2 +iget-quick 22cs y field-offset optimized|continue|throw |