summaryrefslogtreecommitdiffstats
path: root/opcode-gen
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-11-30 14:58:53 -0800
committerDan Bornstein <danfuzz@android.com>2010-11-30 15:25:30 -0800
commit0759f52f2dd8497cc489b889a25e91d48ea10751 (patch)
tree322e61a2c05c44dc60ac2e16e959ceef557b2181 /opcode-gen
parent36cead91c7f34f9521e453dcb285e1e88fdbbfa3 (diff)
downloadandroid_dalvik-0759f52f2dd8497cc489b889a25e91d48ea10751.tar.gz
android_dalvik-0759f52f2dd8497cc489b889a25e91d48ea10751.tar.bz2
android_dalvik-0759f52f2dd8497cc489b889a25e91d48ea10751.zip
invoke-direct-empty doesn't actually invoke anything.
Update bytecode.txt as well as a couple bits in the JIT in recognition of this fact. Change-Id: I989556d39b40a879021eaf841404e015076073be
Diffstat (limited to 'opcode-gen')
-rw-r--r--opcode-gen/bytecode.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/opcode-gen/bytecode.txt b/opcode-gen/bytecode.txt
index b24e6119a..773a1f7fe 100644
--- a/opcode-gen/bytecode.txt
+++ b/opcode-gen/bytecode.txt
@@ -74,7 +74,10 @@ format 3rms
# switch -- is a switch
# throw -- might throw an exception
# return -- is a return from method
-# invoke -- is a method invoke
+# invoke -- is a method invoke; this is only used for true
+# method invokes and notably *not* vm-implemented
+# execute-inline nor the nop-equivalent
+# invoke-direct-empty
# Regular opcodes (with a couple holes)
op 00 nop 10x n none continue
@@ -316,7 +319,7 @@ op ec ^breakpoint 00x n unknown optimized
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
-op f0 +invoke-direct-empty 35c n method-ref optimized|continue|throw|invoke
+op f0 +invoke-direct-empty 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
op f3 +iget-wide-quick 22cs y field-offset optimized|continue|throw