Remove repeated newlines at the end of files.
Change-Id: I1e3d103a7b932ef21acedb6438c0f26b315df28f
diff --git a/dalvikvm/Main.c b/dalvikvm/Main.c
index a6439fb..666317c 100644
--- a/dalvikvm/Main.c
+++ b/dalvikvm/Main.c
@@ -299,4 +299,3 @@
/*printf("--- VM is down, process exiting\n");*/
return result;
}
-
diff --git a/dexdump/Android.mk b/dexdump/Android.mk
index c8720d8..077339f 100644
--- a/dexdump/Android.mk
+++ b/dexdump/Android.mk
@@ -72,4 +72,3 @@
include $(BUILD_HOST_EXECUTABLE)
endif # !TARGET_SIMULATOR
-
diff --git a/dexdump/DexDump.c b/dexdump/DexDump.c
index 318f840..e8dcf61 100644
--- a/dexdump/DexDump.c
+++ b/dexdump/DexDump.c
@@ -1893,4 +1893,3 @@
return (result != 0);
}
-
diff --git a/dexdump/OpCodeNames.c b/dexdump/OpCodeNames.c
index e0645cc..e315574 100644
--- a/dexdump/OpCodeNames.c
+++ b/dexdump/OpCodeNames.c
@@ -327,4 +327,3 @@
{
return gOpNames[op];
}
-
diff --git a/dexlist/DexList.c b/dexlist/DexList.c
index f2bec09..3552d2e 100644
--- a/dexlist/DexList.c
+++ b/dexlist/DexList.c
@@ -291,4 +291,3 @@
free(gParms.argCopy);
return result;
}
-
diff --git a/dexopt/OptMain.c b/dexopt/OptMain.c
index edd5425..8dffcf5 100644
--- a/dexopt/OptMain.c
+++ b/dexopt/OptMain.c
@@ -485,4 +485,3 @@
fprintf(stderr, "Usage: don't use this\n");
return 1;
}
-
diff --git a/docs/porting-proto.c.txt b/docs/porting-proto.c.txt
index 2f72bac..98c6fd3 100644
--- a/docs/porting-proto.c.txt
+++ b/docs/porting-proto.c.txt
@@ -242,4 +242,3 @@
#ifdef __ARM_ARCH_7A__
# warning "found __ARM_ARCH_7A__"
#endif
-
diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat
index 1361bb6..36b6206 100755
--- a/dx/etc/dx.bat
+++ b/dx/etc/dx.bat
@@ -83,4 +83,3 @@
set javaOpts=%javaOpts% %defaultMx%
call java %javaOpts% -Djava.ext.dirs=%frameworkdir% -jar %jarpath% %args%
-
diff --git a/dx/etc/run-opcode-gen b/dx/etc/run-opcode-gen
index 70e9707..061c048 100755
--- a/dx/etc/run-opcode-gen
+++ b/dx/etc/run-opcode-gen
@@ -18,5 +18,3 @@
./opcode-gen ../src/com/android/dx/dex/code/DalvOps.java
./opcode-gen ../src/com/android/dx/dex/code/Dops.java
-
-
diff --git a/dx/src/Android.mk b/dx/src/Android.mk
index ef3d32d..d09ac69 100644
--- a/dx/src/Android.mk
+++ b/dx/src/Android.mk
@@ -28,4 +28,3 @@
LOCAL_IS_HOST_MODULE := true
include $(BUILD_DROIDDOC)
-
diff --git a/dx/tests/010-class-attrib-InnerClasses/small-class.txt b/dx/tests/010-class-attrib-InnerClasses/small-class.txt
index 6ad13a4..54fd19d 100644
--- a/dx/tests/010-class-attrib-InnerClasses/small-class.txt
+++ b/dx/tests/010-class-attrib-InnerClasses/small-class.txt
@@ -35,4 +35,3 @@
0003 0000 0001 0002 # Small / null / "Small" / private
0003 0007 0000 0004 # Small / Zorch / null / protected
0007 0003 0006 ffff # Zorch / Small / "Zorch" / all-bits
-
diff --git a/dx/tests/021-code-attrib-LineNumberTable/info.txt b/dx/tests/021-code-attrib-LineNumberTable/info.txt
index 3e81d29..2ffc798 100644
--- a/dx/tests/021-code-attrib-LineNumberTable/info.txt
+++ b/dx/tests/021-code-attrib-LineNumberTable/info.txt
@@ -5,4 +5,3 @@
The salient bit of parsing tested here is that the class has a single
method with a simple Code attribute, which itself has a syntactically
valid LineNumberTable attribute.
-
diff --git a/dx/tests/022-code-attrib-LocalVariableTable/info.txt b/dx/tests/022-code-attrib-LocalVariableTable/info.txt
index d1afa33..5b44286 100644
--- a/dx/tests/022-code-attrib-LocalVariableTable/info.txt
+++ b/dx/tests/022-code-attrib-LocalVariableTable/info.txt
@@ -5,4 +5,3 @@
The salient bit of parsing tested here is that the class has a single
method with a simple Code attribute, which itself has a syntactically
valid LocalVariableTable attribute.
-
diff --git a/dx/tests/023-code-exception-table/info.txt b/dx/tests/023-code-exception-table/info.txt
index f4bb35e..2dbb5da 100644
--- a/dx/tests/023-code-exception-table/info.txt
+++ b/dx/tests/023-code-exception-table/info.txt
@@ -5,4 +5,3 @@
The salient bit of parsing tested here is that the class has a single
method with a minimal but syntactically valid Code attribute, which
sports a non-empty syntactically valid exception table.
-
diff --git a/dx/tests/028-class-attrib-EnclosingMethod/info.txt b/dx/tests/028-class-attrib-EnclosingMethod/info.txt
index 206a43e..9600803 100644
--- a/dx/tests/028-class-attrib-EnclosingMethod/info.txt
+++ b/dx/tests/028-class-attrib-EnclosingMethod/info.txt
@@ -6,4 +6,3 @@
class-level EnclosingMethod attribute, which is syntactically valid. There
are two possible variants (method may be null), and this test contains one
of each.
-
diff --git a/dx/tests/031-bb-dead-code/blort.j b/dx/tests/031-bb-dead-code/blort.j
index d3e20d0..b6854f2 100644
--- a/dx/tests/031-bb-dead-code/blort.j
+++ b/dx/tests/031-bb-dead-code/blort.j
@@ -180,4 +180,3 @@
blort:
return
.end method
-
diff --git a/dx/tests/032-bb-live-code/blort.j b/dx/tests/032-bb-live-code/blort.j
index a1ec1dc..05790bb 100644
--- a/dx/tests/032-bb-live-code/blort.j
+++ b/dx/tests/032-bb-live-code/blort.j
@@ -340,4 +340,3 @@
multianewarray [[[I 2
return
.end method
-
diff --git a/dx/tests/038-dex-instance-method/info.txt b/dx/tests/038-dex-instance-method/info.txt
index c9ce0b1..6aa93c3 100644
--- a/dx/tests/038-dex-instance-method/info.txt
+++ b/dx/tests/038-dex-instance-method/info.txt
@@ -2,4 +2,3 @@
conversion runs without failure, though the contents of the converted
file are not checked for correctness. This test is of a classfile with
just an instance method.
-
diff --git a/dx/tests/083-ssa-phi-placement/Blort.java b/dx/tests/083-ssa-phi-placement/Blort.java
index ee14c83..ed3264d 100644
--- a/dx/tests/083-ssa-phi-placement/Blort.java
+++ b/dx/tests/083-ssa-phi-placement/Blort.java
@@ -64,4 +64,3 @@
}
}
}
-
diff --git a/dx/tests/085-dex-jsr-ret/blort.j b/dx/tests/085-dex-jsr-ret/blort.j
index 2f4bf38..2616723 100644
--- a/dx/tests/085-dex-jsr-ret/blort.j
+++ b/dx/tests/085-dex-jsr-ret/blort.j
@@ -67,5 +67,3 @@
.catch java/lang/Throwable from j2 to j2a using catchBlock
.end method
-
-
diff --git a/dx/tests/085-dex-jsr-ret/info.txt b/dx/tests/085-dex-jsr-ret/info.txt
index 4542fde..8e164d6 100644
--- a/dx/tests/085-dex-jsr-ret/info.txt
+++ b/dx/tests/085-dex-jsr-ret/info.txt
@@ -1,2 +1 @@
Tests handling of the Java jsr/jsr_w/ret bytecodes.
-
diff --git a/dx/tests/086-ssa-edge-split/Blort.java b/dx/tests/086-ssa-edge-split/Blort.java
index b843381..d12b3f9 100644
--- a/dx/tests/086-ssa-edge-split/Blort.java
+++ b/dx/tests/086-ssa-edge-split/Blort.java
@@ -72,4 +72,3 @@
return y;
}
}
-
diff --git a/dx/tests/087-ssa-local-vars/Blort.java b/dx/tests/087-ssa-local-vars/Blort.java
index b1e0776..7ce8a91 100644
--- a/dx/tests/087-ssa-local-vars/Blort.java
+++ b/dx/tests/087-ssa-local-vars/Blort.java
@@ -92,4 +92,3 @@
}
}
}
-
diff --git a/dx/tests/088-ssa-combine-blocks/Blort.java b/dx/tests/088-ssa-combine-blocks/Blort.java
index 7fbfea2..bf49dbe 100644
--- a/dx/tests/088-ssa-combine-blocks/Blort.java
+++ b/dx/tests/088-ssa-combine-blocks/Blort.java
@@ -42,4 +42,3 @@
}
}
}
-
diff --git a/dx/tests/091-ssa-const-collector/Blort.java b/dx/tests/091-ssa-const-collector/Blort.java
index ec410f9..ea99a0d 100644
--- a/dx/tests/091-ssa-const-collector/Blort.java
+++ b/dx/tests/091-ssa-const-collector/Blort.java
@@ -62,4 +62,3 @@
}
}
-
diff --git a/dx/tests/092-ssa-cfg-edge-cases/Blort.java b/dx/tests/092-ssa-cfg-edge-cases/Blort.java
index 30dfe8b..8b3602f 100644
--- a/dx/tests/092-ssa-cfg-edge-cases/Blort.java
+++ b/dx/tests/092-ssa-cfg-edge-cases/Blort.java
@@ -18,4 +18,3 @@
}
}
}
-
diff --git a/dx/tests/093-ssa-invoke-range/Blort.java b/dx/tests/093-ssa-invoke-range/Blort.java
index 88c19bb..f2bb66c 100644
--- a/dx/tests/093-ssa-invoke-range/Blort.java
+++ b/dx/tests/093-ssa-invoke-range/Blort.java
@@ -67,4 +67,3 @@
}
}
}
-
diff --git a/dx/tests/094-scala-locals/blort.j b/dx/tests/094-scala-locals/blort.j
index 0d3cae5..7c711ef 100644
--- a/dx/tests/094-scala-locals/blort.j
+++ b/dx/tests/094-scala-locals/blort.j
@@ -42,4 +42,3 @@
end:
return
.end method
-
diff --git a/dx/tests/095-dex-const-string-jumbo/run b/dx/tests/095-dex-const-string-jumbo/run
index d984333..a1c7365 100644
--- a/dx/tests/095-dex-const-string-jumbo/run
+++ b/dx/tests/095-dex-const-string-jumbo/run
@@ -39,4 +39,3 @@
$JAVAC -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
-
diff --git a/dx/tests/098-dex-jsr-ret-throw/info.txt b/dx/tests/098-dex-jsr-ret-throw/info.txt
index 41636a2..9dcd39d 100644
--- a/dx/tests/098-dex-jsr-ret-throw/info.txt
+++ b/dx/tests/098-dex-jsr-ret-throw/info.txt
@@ -2,4 +2,3 @@
It contains an example of a subroutine being exited by a "throw" instruction in
such a way that it caused the frame merge and subroutine inliner
algorithms to not converge. This was bug #1137450.
-
diff --git a/dx/tests/104-verify-return-ops/run b/dx/tests/104-verify-return-ops/run
index 471d490..fbce332 100644
--- a/dx/tests/104-verify-return-ops/run
+++ b/dx/tests/104-verify-return-ops/run
@@ -36,4 +36,3 @@
oneop sig_ireturn
oneop sig_lreturn
oneop sig_return
-
diff --git a/dx/tests/105-verify-load-store-ops/info.txt b/dx/tests/105-verify-load-store-ops/info.txt
index 85b7311..a3a41d6 100644
--- a/dx/tests/105-verify-load-store-ops/info.txt
+++ b/dx/tests/105-verify-load-store-ops/info.txt
@@ -1,3 +1,2 @@
This tests that load and store opcodes verify that their arguments are
actually of the appropriate types.
-
diff --git a/dx/tests/111-use-null-as-array/Blort.java b/dx/tests/111-use-null-as-array/Blort.java
index c16684f..79d2b4f 100644
--- a/dx/tests/111-use-null-as-array/Blort.java
+++ b/dx/tests/111-use-null-as-array/Blort.java
@@ -105,4 +105,3 @@
arr[15] = (short) 16;
}
}
-
diff --git a/dx/tests/run-all-tests b/dx/tests/run-all-tests
index cada8e3..68062c2 100755
--- a/dx/tests/run-all-tests
+++ b/dx/tests/run-all-tests
@@ -55,4 +55,3 @@
for i in $failNames; do
echo "failed: $i"
done
-
diff --git a/libdex/DexFile.c b/libdex/DexFile.c
index 2fc1768..0050e4a 100644
--- a/libdex/DexFile.c
+++ b/libdex/DexFile.c
@@ -1254,4 +1254,3 @@
free(methodDescriptor);
}
}
-
diff --git a/libdex/DexInlines.c b/libdex/DexInlines.c
index ac0262f..6b3aed8 100644
--- a/libdex/DexInlines.c
+++ b/libdex/DexInlines.c
@@ -28,4 +28,3 @@
#include "InstrUtils.h"
#include "Leb128.h"
#include "ZipArchive.h"
-
diff --git a/libdex/DexProto.c b/libdex/DexProto.c
index 28cad6e..b5574dc 100644
--- a/libdex/DexProto.c
+++ b/libdex/DexProto.c
@@ -531,4 +531,3 @@
return dexStringByTypeIdx(pIterator->proto->dexFile, idx);
}
-
diff --git a/libdex/OptInvocation.c b/libdex/OptInvocation.c
index 8ce918b..df5f8d9 100644
--- a/libdex/OptInvocation.c
+++ b/libdex/OptInvocation.c
@@ -140,4 +140,3 @@
return 0;
}
-
diff --git a/libdex/SysUtil.c b/libdex/SysUtil.c
index ca64c25..e2b1fff 100644
--- a/libdex/SysUtil.c
+++ b/libdex/SysUtil.c
@@ -406,4 +406,3 @@
return 0;
}
-
diff --git a/libdex/ZipArchive.c b/libdex/ZipArchive.c
index 62a8ef1..756f488 100644
--- a/libdex/ZipArchive.c
+++ b/libdex/ZipArchive.c
@@ -745,4 +745,3 @@
bail:
return result;
}
-
diff --git a/libnativehelper/README b/libnativehelper/README
index fa757c0..5a5f5d4 100644
--- a/libnativehelper/README
+++ b/libnativehelper/README
@@ -9,4 +9,3 @@
- SHOULD be written in C rather than C++ where possible.
Some helper functions are defined in include/nativehelper/JNIHelp.h.
-
diff --git a/tests/003-omnibus-opcodes/build b/tests/003-omnibus-opcodes/build
index 0259995..9eb5ed3 100644
--- a/tests/003-omnibus-opcodes/build
+++ b/tests/003-omnibus-opcodes/build
@@ -24,4 +24,3 @@
dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes
zip test.jar classes.dex
-
diff --git a/tests/003-omnibus-opcodes/src/Array.java b/tests/003-omnibus-opcodes/src/Array.java
index 6f1aa47..f385dd8 100644
--- a/tests/003-omnibus-opcodes/src/Array.java
+++ b/tests/003-omnibus-opcodes/src/Array.java
@@ -222,4 +222,3 @@
checkNegAlloc(-1);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/Compare.java b/tests/003-omnibus-opcodes/src/Compare.java
index 27d6862..43a708a 100644
--- a/tests/003-omnibus-opcodes/src/Compare.java
+++ b/tests/003-omnibus-opcodes/src/Compare.java
@@ -169,4 +169,3 @@
testDoubleCompare(-5.0, 4.0, 4.0, (1.0/0.0) / (1.0/0.0));
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/FloatMath.java b/tests/003-omnibus-opcodes/src/FloatMath.java
index cf4869c..3c49402 100644
--- a/tests/003-omnibus-opcodes/src/FloatMath.java
+++ b/tests/003-omnibus-opcodes/src/FloatMath.java
@@ -335,4 +335,3 @@
jlmTests(3.14159f, 123456.78987654321);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/Goto.java b/tests/003-omnibus-opcodes/src/Goto.java
index 5b467fd..d56ceae 100644
--- a/tests/003-omnibus-opcodes/src/Goto.java
+++ b/tests/003-omnibus-opcodes/src/Goto.java
@@ -2406,4 +2406,3 @@
bigGoto(true);
}
};
-
diff --git a/tests/003-omnibus-opcodes/src/InstField.java b/tests/003-omnibus-opcodes/src/InstField.java
index 2756be6..80b95ab 100644
--- a/tests/003-omnibus-opcodes/src/InstField.java
+++ b/tests/003-omnibus-opcodes/src/InstField.java
@@ -106,4 +106,3 @@
assert(mVolatileLong2 == -1234605616436508551L);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/IntMath.java b/tests/003-omnibus-opcodes/src/IntMath.java
index d5ac744..89194de 100644
--- a/tests/003-omnibus-opcodes/src/IntMath.java
+++ b/tests/003-omnibus-opcodes/src/IntMath.java
@@ -490,4 +490,3 @@
jlmTests(12345, 0x1122334455667788L);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/MethodCall.java b/tests/003-omnibus-opcodes/src/MethodCall.java
index 2a365f2..f89194b 100644
--- a/tests/003-omnibus-opcodes/src/MethodCall.java
+++ b/tests/003-omnibus-opcodes/src/MethodCall.java
@@ -80,4 +80,3 @@
return 7;
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/Monitor.java b/tests/003-omnibus-opcodes/src/Monitor.java
index 0518ad9..66d7c65 100644
--- a/tests/003-omnibus-opcodes/src/Monitor.java
+++ b/tests/003-omnibus-opcodes/src/Monitor.java
@@ -42,4 +42,3 @@
assert(mVal == 2);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/StaticField.java b/tests/003-omnibus-opcodes/src/StaticField.java
index 2d403b9..7ccdd7e 100644
--- a/tests/003-omnibus-opcodes/src/StaticField.java
+++ b/tests/003-omnibus-opcodes/src/StaticField.java
@@ -74,4 +74,3 @@
assert(mVolatileLong2 == -1234605616436508551L);
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/Switch.java b/tests/003-omnibus-opcodes/src/Switch.java
index de1b7e1..67c82b0 100644
--- a/tests/003-omnibus-opcodes/src/Switch.java
+++ b/tests/003-omnibus-opcodes/src/Switch.java
@@ -60,4 +60,3 @@
testSwitch();
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/Throw.java b/tests/003-omnibus-opcodes/src/Throw.java
index 2d4e130..91ee6dd 100644
--- a/tests/003-omnibus-opcodes/src/Throw.java
+++ b/tests/003-omnibus-opcodes/src/Throw.java
@@ -122,4 +122,3 @@
th.rethrow();
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/UnresClass.java b/tests/003-omnibus-opcodes/src/UnresClass.java
index 10dd79a..52b3d4f 100644
--- a/tests/003-omnibus-opcodes/src/UnresClass.java
+++ b/tests/003-omnibus-opcodes/src/UnresClass.java
@@ -7,4 +7,3 @@
public class UnresClass {
int foo;
}
-
diff --git a/tests/003-omnibus-opcodes/src/UnresStuff.java b/tests/003-omnibus-opcodes/src/UnresStuff.java
index 5c925af..1d2a556 100644
--- a/tests/003-omnibus-opcodes/src/UnresStuff.java
+++ b/tests/003-omnibus-opcodes/src/UnresStuff.java
@@ -20,4 +20,3 @@
System.out.println("unres!");
}
}
-
diff --git a/tests/003-omnibus-opcodes/src/UnresTest2.java b/tests/003-omnibus-opcodes/src/UnresTest2.java
index b458bfe..768be8f 100644
--- a/tests/003-omnibus-opcodes/src/UnresTest2.java
+++ b/tests/003-omnibus-opcodes/src/UnresTest2.java
@@ -47,4 +47,3 @@
System.out.println("UnresTest2 done");
}
}
-
diff --git a/tests/003-omnibus-opcodes/src2/UnresStuff.java b/tests/003-omnibus-opcodes/src2/UnresStuff.java
index 8b4b884..56f43af 100644
--- a/tests/003-omnibus-opcodes/src2/UnresStuff.java
+++ b/tests/003-omnibus-opcodes/src2/UnresStuff.java
@@ -7,4 +7,3 @@
public class UnresStuff {
public int x;
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoArrayField.java b/tests/004-annotations/src/android/test/anno/AnnoArrayField.java
index d929aac..681045c 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoArrayField.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoArrayField.java
@@ -17,4 +17,3 @@
double[] dd() default {0.987654321};
String[] str() default {};
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoFancyConstructor.java b/tests/004-annotations/src/android/test/anno/AnnoFancyConstructor.java
index e807a32..19dadec 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoFancyConstructor.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoFancyConstructor.java
@@ -8,4 +8,3 @@
public @interface AnnoFancyConstructor {
public int numArgs() default 0;
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoFancyField.java b/tests/004-annotations/src/android/test/anno/AnnoFancyField.java
index 3637976..855ba56 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoFancyField.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoFancyField.java
@@ -10,4 +10,3 @@
public @interface AnnoFancyField {
public String nombre() default "no se";
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoFancyMethod.java b/tests/004-annotations/src/android/test/anno/AnnoFancyMethod.java
index 0958f34..3088866 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoFancyMethod.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoFancyMethod.java
@@ -12,4 +12,3 @@
AnnoFancyMethodEnum enumerated() default AnnoFancyMethodEnum.FOO;
Class someClass() default SomeClass.class;
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoFancyParameter.java b/tests/004-annotations/src/android/test/anno/AnnoFancyParameter.java
index 2bda6ee..bc2ba7c 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoFancyParameter.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoFancyParameter.java
@@ -8,4 +8,3 @@
public @interface AnnoFancyParameter {
double factor();
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoFancyType.java b/tests/004-annotations/src/android/test/anno/AnnoFancyType.java
index 34ba009..745f838 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoFancyType.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoFancyType.java
@@ -9,4 +9,3 @@
public int num();
public String name() default "unknown";
}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleConstructor.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleConstructor.java
index c0c127b..d66b9ae 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleConstructor.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleConstructor.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimpleConstructor {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleField.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleField.java
index 6428f1a..04193d2 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleField.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleField.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimpleField {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleLocalVariable.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleLocalVariable.java
index 9a5e062..a839fa2 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleLocalVariable.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleLocalVariable.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimpleLocalVariable {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleMethod.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleMethod.java
index 78e46aa..fcd9c0f 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleMethod.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleMethod.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimpleMethod {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimplePackage.java b/tests/004-annotations/src/android/test/anno/AnnoSimplePackage.java
index 8d37376..4aadfe7 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimplePackage.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimplePackage.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimplePackage {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleParameter.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleParameter.java
index 305f6d5..6e26ca3 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleParameter.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleParameter.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
public @interface AnnoSimpleParameter {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleType.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleType.java
index 7c3c718..3bba3db 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleType.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleType.java
@@ -7,4 +7,3 @@
@Inherited
@Documented
public @interface AnnoSimpleType {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleType2.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleType2.java
index 8bae110..f74b291 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleType2.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleType2.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.RUNTIME)
@Inherited
public @interface AnnoSimpleType2 {}
-
diff --git a/tests/004-annotations/src/android/test/anno/AnnoSimpleTypeInvis.java b/tests/004-annotations/src/android/test/anno/AnnoSimpleTypeInvis.java
index e6ae9ce..541d82e 100644
--- a/tests/004-annotations/src/android/test/anno/AnnoSimpleTypeInvis.java
+++ b/tests/004-annotations/src/android/test/anno/AnnoSimpleTypeInvis.java
@@ -6,4 +6,3 @@
@Retention(RetentionPolicy.CLASS)
public @interface AnnoSimpleTypeInvis {}
-
diff --git a/tests/004-annotations/src/android/test/anno/ExportedProperty.java b/tests/004-annotations/src/android/test/anno/ExportedProperty.java
index 380b93d..810d28f 100644
--- a/tests/004-annotations/src/android/test/anno/ExportedProperty.java
+++ b/tests/004-annotations/src/android/test/anno/ExportedProperty.java
@@ -10,4 +10,3 @@
boolean resolveId() default false;
IntToString[] mapping() default { @IntToString(from = -1, to = "-1") };
}
-
diff --git a/tests/004-annotations/src/android/test/anno/FullyNoted.java b/tests/004-annotations/src/android/test/anno/FullyNoted.java
index d24a6d8..76a7b04 100644
--- a/tests/004-annotations/src/android/test/anno/FullyNoted.java
+++ b/tests/004-annotations/src/android/test/anno/FullyNoted.java
@@ -37,4 +37,3 @@
return 0;
}
}
-
diff --git a/tests/004-annotations/src/android/test/anno/INoted.java b/tests/004-annotations/src/android/test/anno/INoted.java
index 7a7198c..b2cd007 100644
--- a/tests/004-annotations/src/android/test/anno/INoted.java
+++ b/tests/004-annotations/src/android/test/anno/INoted.java
@@ -5,4 +5,3 @@
@AnnoSimpleMethod
public int bar();
}
-
diff --git a/tests/004-annotations/src/android/test/anno/IntToString.java b/tests/004-annotations/src/android/test/anno/IntToString.java
index 5363c83..e84fcfa 100644
--- a/tests/004-annotations/src/android/test/anno/IntToString.java
+++ b/tests/004-annotations/src/android/test/anno/IntToString.java
@@ -10,4 +10,3 @@
int from();
String to();
}
-
diff --git a/tests/004-annotations/src/android/test/anno/SimplyNoted.java b/tests/004-annotations/src/android/test/anno/SimplyNoted.java
index 7dce77e..95a3d24 100644
--- a/tests/004-annotations/src/android/test/anno/SimplyNoted.java
+++ b/tests/004-annotations/src/android/test/anno/SimplyNoted.java
@@ -28,4 +28,3 @@
return bar;
}
}
-
diff --git a/tests/004-annotations/src/android/test/anno/SomeClass.java b/tests/004-annotations/src/android/test/anno/SomeClass.java
index 5bb05c9..c21d68d 100644
--- a/tests/004-annotations/src/android/test/anno/SomeClass.java
+++ b/tests/004-annotations/src/android/test/anno/SomeClass.java
@@ -2,4 +2,3 @@
public class SomeClass {
}
-
diff --git a/tests/004-annotations/src/android/test/anno/SubNoted.java b/tests/004-annotations/src/android/test/anno/SubNoted.java
index 089e5e6..2530346 100644
--- a/tests/004-annotations/src/android/test/anno/SubNoted.java
+++ b/tests/004-annotations/src/android/test/anno/SubNoted.java
@@ -10,4 +10,3 @@
return 0;
}
}
-
diff --git a/tests/004-annotations/src/android/test/anno/TestAnnotations.java b/tests/004-annotations/src/android/test/anno/TestAnnotations.java
index 1809446..4ad32d5 100644
--- a/tests/004-annotations/src/android/test/anno/TestAnnotations.java
+++ b/tests/004-annotations/src/android/test/anno/TestAnnotations.java
@@ -175,4 +175,3 @@
System.out.println("SubNoted.get(AnnoSimpleType) = " + anno);
}
}
-
diff --git a/tests/004-annotations/src/android/test/anno/package-info.java b/tests/004-annotations/src/android/test/anno/package-info.java
index f434024..74b11f9 100644
--- a/tests/004-annotations/src/android/test/anno/package-info.java
+++ b/tests/004-annotations/src/android/test/anno/package-info.java
@@ -1,3 +1,2 @@
@AnnoSimplePackage
package android.test.anno;
-
diff --git a/tests/008-instanceof/src/Iface1.java b/tests/008-instanceof/src/Iface1.java
index 12dcfe7..ba17d45 100644
--- a/tests/008-instanceof/src/Iface1.java
+++ b/tests/008-instanceof/src/Iface1.java
@@ -11,4 +11,3 @@
public String mWahoo = new String("wahoo");
}
-
diff --git a/tests/008-instanceof/src/Iface2.java b/tests/008-instanceof/src/Iface2.java
index 6f8c262..83fe650 100644
--- a/tests/008-instanceof/src/Iface2.java
+++ b/tests/008-instanceof/src/Iface2.java
@@ -7,4 +7,3 @@
public int iFunc2(int ii);
}
-
diff --git a/tests/008-instanceof/src/Iface2Sub1.java b/tests/008-instanceof/src/Iface2Sub1.java
index 83c8791..db3e905 100644
--- a/tests/008-instanceof/src/Iface2Sub1.java
+++ b/tests/008-instanceof/src/Iface2Sub1.java
@@ -7,4 +7,3 @@
//public int iFunc2(int ii);
}
-
diff --git a/tests/008-instanceof/src/ImplA.java b/tests/008-instanceof/src/ImplA.java
index 9949d01..9007001 100644
--- a/tests/008-instanceof/src/ImplA.java
+++ b/tests/008-instanceof/src/ImplA.java
@@ -12,4 +12,3 @@
return ii+2;
}
}
-
diff --git a/tests/008-instanceof/src/ImplB.java b/tests/008-instanceof/src/ImplB.java
index b3a0c89..619fa00 100644
--- a/tests/008-instanceof/src/ImplB.java
+++ b/tests/008-instanceof/src/ImplB.java
@@ -14,4 +14,3 @@
public static String mWhoami = new String("ImplB!");
}
-
diff --git a/tests/009-instanceof2/src/Iface1.java b/tests/009-instanceof2/src/Iface1.java
index 12dcfe7..ba17d45 100644
--- a/tests/009-instanceof2/src/Iface1.java
+++ b/tests/009-instanceof2/src/Iface1.java
@@ -11,4 +11,3 @@
public String mWahoo = new String("wahoo");
}
-
diff --git a/tests/009-instanceof2/src/Iface2.java b/tests/009-instanceof2/src/Iface2.java
index 6f8c262..83fe650 100644
--- a/tests/009-instanceof2/src/Iface2.java
+++ b/tests/009-instanceof2/src/Iface2.java
@@ -7,4 +7,3 @@
public int iFunc2(int ii);
}
-
diff --git a/tests/009-instanceof2/src/Iface2Sub1.java b/tests/009-instanceof2/src/Iface2Sub1.java
index 83c8791..db3e905 100644
--- a/tests/009-instanceof2/src/Iface2Sub1.java
+++ b/tests/009-instanceof2/src/Iface2Sub1.java
@@ -7,4 +7,3 @@
//public int iFunc2(int ii);
}
-
diff --git a/tests/009-instanceof2/src/ImplA.java b/tests/009-instanceof2/src/ImplA.java
index 9949d01..9007001 100644
--- a/tests/009-instanceof2/src/ImplA.java
+++ b/tests/009-instanceof2/src/ImplA.java
@@ -12,4 +12,3 @@
return ii+2;
}
}
-
diff --git a/tests/009-instanceof2/src/ImplB.java b/tests/009-instanceof2/src/ImplB.java
index b3a0c89..619fa00 100644
--- a/tests/009-instanceof2/src/ImplB.java
+++ b/tests/009-instanceof2/src/ImplB.java
@@ -14,4 +14,3 @@
public static String mWhoami = new String("ImplB!");
}
-
diff --git a/tests/010-instance/src/Y.java b/tests/010-instance/src/Y.java
index 6585ee7..2b2c371 100644
--- a/tests/010-instance/src/Y.java
+++ b/tests/010-instance/src/Y.java
@@ -6,4 +6,3 @@
return 1;
}
}
-
diff --git a/tests/011-array-copy/src/Iface1.java b/tests/011-array-copy/src/Iface1.java
index 12dcfe7..ba17d45 100644
--- a/tests/011-array-copy/src/Iface1.java
+++ b/tests/011-array-copy/src/Iface1.java
@@ -11,4 +11,3 @@
public String mWahoo = new String("wahoo");
}
-
diff --git a/tests/011-array-copy/src/Iface2.java b/tests/011-array-copy/src/Iface2.java
index 6f8c262..83fe650 100644
--- a/tests/011-array-copy/src/Iface2.java
+++ b/tests/011-array-copy/src/Iface2.java
@@ -7,4 +7,3 @@
public int iFunc2(int ii);
}
-
diff --git a/tests/011-array-copy/src/ImplA.java b/tests/011-array-copy/src/ImplA.java
index 9949d01..9007001 100644
--- a/tests/011-array-copy/src/ImplA.java
+++ b/tests/011-array-copy/src/ImplA.java
@@ -12,4 +12,3 @@
return ii+2;
}
}
-
diff --git a/tests/015-switch/src/Main.java b/tests/015-switch/src/Main.java
index 678a564..7198e2b 100644
--- a/tests/015-switch/src/Main.java
+++ b/tests/015-switch/src/Main.java
@@ -103,4 +103,3 @@
}
}
}
-
diff --git a/tests/022-interface/src/Iface1.java b/tests/022-interface/src/Iface1.java
index 12dcfe7..ba17d45 100644
--- a/tests/022-interface/src/Iface1.java
+++ b/tests/022-interface/src/Iface1.java
@@ -11,4 +11,3 @@
public String mWahoo = new String("wahoo");
}
-
diff --git a/tests/022-interface/src/Iface2.java b/tests/022-interface/src/Iface2.java
index 6f8c262..83fe650 100644
--- a/tests/022-interface/src/Iface2.java
+++ b/tests/022-interface/src/Iface2.java
@@ -7,4 +7,3 @@
public int iFunc2(int ii);
}
-
diff --git a/tests/022-interface/src/Iface2Sub1.java b/tests/022-interface/src/Iface2Sub1.java
index 83c8791..db3e905 100644
--- a/tests/022-interface/src/Iface2Sub1.java
+++ b/tests/022-interface/src/Iface2Sub1.java
@@ -7,4 +7,3 @@
//public int iFunc2(int ii);
}
-
diff --git a/tests/022-interface/src/ImplA.java b/tests/022-interface/src/ImplA.java
index 9949d01..9007001 100644
--- a/tests/022-interface/src/ImplA.java
+++ b/tests/022-interface/src/ImplA.java
@@ -12,4 +12,3 @@
return ii+2;
}
}
-
diff --git a/tests/022-interface/src/ImplB.java b/tests/022-interface/src/ImplB.java
index b3a0c89..619fa00 100644
--- a/tests/022-interface/src/ImplB.java
+++ b/tests/022-interface/src/ImplB.java
@@ -14,4 +14,3 @@
public static String mWhoami = new String("ImplB!");
}
-
diff --git a/tests/023-many-interfaces/iface-gen.c b/tests/023-many-interfaces/iface-gen.c
index 313de69..1e3284a 100644
--- a/tests/023-many-interfaces/iface-gen.c
+++ b/tests/023-many-interfaces/iface-gen.c
@@ -52,4 +52,3 @@
return (result != 0);
}
-
diff --git a/tests/023-many-interfaces/src/ManyInterfaces.java b/tests/023-many-interfaces/src/ManyInterfaces.java
index f860f67..375938a 100644
--- a/tests/023-many-interfaces/src/ManyInterfaces.java
+++ b/tests/023-many-interfaces/src/ManyInterfaces.java
@@ -411,4 +411,3 @@
}
}
}
-
diff --git a/tests/024-illegal-access/src/SemiPrivate.java b/tests/024-illegal-access/src/SemiPrivate.java
index cc7f2d8..17b2ac0 100644
--- a/tests/024-illegal-access/src/SemiPrivate.java
+++ b/tests/024-illegal-access/src/SemiPrivate.java
@@ -6,4 +6,3 @@
public class SemiPrivate {
/* not private */ static String mPrivvy = "stuff";
}
-
diff --git a/tests/024-illegal-access/src/otherpkg/Package.java b/tests/024-illegal-access/src/otherpkg/Package.java
index a82b321..bc295b5 100644
--- a/tests/024-illegal-access/src/otherpkg/Package.java
+++ b/tests/024-illegal-access/src/otherpkg/Package.java
@@ -21,4 +21,3 @@
*/
public class Package {
}
-
diff --git a/tests/024-illegal-access/src2/SemiPrivate.java b/tests/024-illegal-access/src2/SemiPrivate.java
index 6bdf610..cf6f8e6 100644
--- a/tests/024-illegal-access/src2/SemiPrivate.java
+++ b/tests/024-illegal-access/src2/SemiPrivate.java
@@ -6,4 +6,3 @@
public class SemiPrivate {
private static String mPrivvy = "stuff";
}
-
diff --git a/tests/024-illegal-access/src2/otherpkg/Package.java b/tests/024-illegal-access/src2/otherpkg/Package.java
index 7f740d4..54d8341 100644
--- a/tests/024-illegal-access/src2/otherpkg/Package.java
+++ b/tests/024-illegal-access/src2/otherpkg/Package.java
@@ -21,4 +21,3 @@
*/
class Package {
}
-
diff --git a/tests/025-access-controller/src/Privvy.java b/tests/025-access-controller/src/Privvy.java
index d8027a1..07a0678 100644
--- a/tests/025-access-controller/src/Privvy.java
+++ b/tests/025-access-controller/src/Privvy.java
@@ -16,4 +16,3 @@
return mValue;
}
}
-
diff --git a/tests/027-arithmetic/src/Main.java b/tests/027-arithmetic/src/Main.java
index 6299eed..4d0f74e 100644
--- a/tests/027-arithmetic/src/Main.java
+++ b/tests/027-arithmetic/src/Main.java
@@ -139,4 +139,3 @@
unsignedShiftTest();
}
}
-
diff --git a/tests/028-array-write/src/Main.java b/tests/028-array-write/src/Main.java
index 40d9a9d..6f36f84 100644
--- a/tests/028-array-write/src/Main.java
+++ b/tests/028-array-write/src/Main.java
@@ -66,4 +66,3 @@
System.out.println("Done!");
}
}
-
diff --git a/tests/029-assert/src/Main.java b/tests/029-assert/src/Main.java
index efa10f7..1e5cc7c 100644
--- a/tests/029-assert/src/Main.java
+++ b/tests/029-assert/src/Main.java
@@ -14,4 +14,3 @@
}
}
}
-
diff --git a/tests/030-bad-finalizer/src/BadFinalizer.java b/tests/030-bad-finalizer/src/BadFinalizer.java
index 25aee3f..3ff422b 100644
--- a/tests/030-bad-finalizer/src/BadFinalizer.java
+++ b/tests/030-bad-finalizer/src/BadFinalizer.java
@@ -30,4 +30,3 @@
}
}
}
-
diff --git a/tests/030-bad-finalizer/src/Main.java b/tests/030-bad-finalizer/src/Main.java
index ef9fc8b..c063476 100644
--- a/tests/030-bad-finalizer/src/Main.java
+++ b/tests/030-bad-finalizer/src/Main.java
@@ -23,4 +23,3 @@
System.exit(0);
}
}
-
diff --git a/tests/032-concrete-sub/src/AbstractBase.java b/tests/032-concrete-sub/src/AbstractBase.java
index 875303e..6281189 100644
--- a/tests/032-concrete-sub/src/AbstractBase.java
+++ b/tests/032-concrete-sub/src/AbstractBase.java
@@ -24,4 +24,3 @@
public void abstractOrNot() {}
}
-
diff --git a/tests/032-concrete-sub/src/ConcreteSub.java b/tests/032-concrete-sub/src/ConcreteSub.java
index 8f78cc9..083f25d 100644
--- a/tests/032-concrete-sub/src/ConcreteSub.java
+++ b/tests/032-concrete-sub/src/ConcreteSub.java
@@ -51,4 +51,3 @@
System.out.println("meth modifiers=" + meth.getModifiers());
}
}
-
diff --git a/tests/032-concrete-sub/src/ConcreteSub2.java b/tests/032-concrete-sub/src/ConcreteSub2.java
index 0b8fbf5..0a9e67e 100644
--- a/tests/032-concrete-sub/src/ConcreteSub2.java
+++ b/tests/032-concrete-sub/src/ConcreteSub2.java
@@ -24,4 +24,3 @@
abstractOrNot();
}
}
-
diff --git a/tests/032-concrete-sub/src/Main.java b/tests/032-concrete-sub/src/Main.java
index a3aa2b8..4a5193d 100644
--- a/tests/032-concrete-sub/src/Main.java
+++ b/tests/032-concrete-sub/src/Main.java
@@ -34,4 +34,3 @@
}
}
}
-
diff --git a/tests/032-concrete-sub/src2/AbstractBase.java b/tests/032-concrete-sub/src2/AbstractBase.java
index 78ec4b1..534f738 100644
--- a/tests/032-concrete-sub/src2/AbstractBase.java
+++ b/tests/032-concrete-sub/src2/AbstractBase.java
@@ -27,4 +27,3 @@
public abstract void abstractOrNot();
}
-
diff --git a/tests/033-class-init-deadlock/src/Main.java b/tests/033-class-init-deadlock/src/Main.java
index 8ff922e..27c4922 100644
--- a/tests/033-class-init-deadlock/src/Main.java
+++ b/tests/033-class-init-deadlock/src/Main.java
@@ -49,4 +49,3 @@
Main.bInitialized = true;
}
}
-
diff --git a/tests/034-call-null/src/Main.java b/tests/034-call-null/src/Main.java
index 6b5c28c..a0a129e 100644
--- a/tests/034-call-null/src/Main.java
+++ b/tests/034-call-null/src/Main.java
@@ -12,4 +12,3 @@
instance.doStuff();
}
}
-
diff --git a/tests/035-enum/src/Main.java b/tests/035-enum/src/Main.java
index c0915d4..09fcc98 100644
--- a/tests/035-enum/src/Main.java
+++ b/tests/035-enum/src/Main.java
@@ -21,4 +21,3 @@
System.out.println(" enum? " + field.isEnumConstant());
}
}
-
diff --git a/tests/036-finalizer/src/FinalizerTest.java b/tests/036-finalizer/src/FinalizerTest.java
index 7bf289e..420ec34 100644
--- a/tests/036-finalizer/src/FinalizerTest.java
+++ b/tests/036-finalizer/src/FinalizerTest.java
@@ -21,4 +21,3 @@
mReborn = this;
}
}
-
diff --git a/tests/036-finalizer/src/Main.java b/tests/036-finalizer/src/Main.java
index 0a42b89..c29cc11 100644
--- a/tests/036-finalizer/src/Main.java
+++ b/tests/036-finalizer/src/Main.java
@@ -105,4 +105,3 @@
System.out.println("wimp: " + wimpString(wimp));
}
}
-
diff --git a/tests/037-inherit/src/Main.java b/tests/037-inherit/src/Main.java
index e0b36c7..55b782e 100644
--- a/tests/037-inherit/src/Main.java
+++ b/tests/037-inherit/src/Main.java
@@ -35,4 +35,3 @@
return this.MAGIC_INT;
}
}
-
diff --git a/tests/039-join-main/src/Main.java b/tests/039-join-main/src/Main.java
index e3e2d3e..0644f1c 100644
--- a/tests/039-join-main/src/Main.java
+++ b/tests/039-join-main/src/Main.java
@@ -39,4 +39,3 @@
}
}
}
-
diff --git a/tests/040-miranda/src/MirandaAbstract.java b/tests/040-miranda/src/MirandaAbstract.java
index 1ce97c3..b603ce6 100644
--- a/tests/040-miranda/src/MirandaAbstract.java
+++ b/tests/040-miranda/src/MirandaAbstract.java
@@ -14,4 +14,3 @@
return true;
}
}
-
diff --git a/tests/040-miranda/src/MirandaClass.java b/tests/040-miranda/src/MirandaClass.java
index 835752d..3bf6704 100644
--- a/tests/040-miranda/src/MirandaClass.java
+++ b/tests/040-miranda/src/MirandaClass.java
@@ -22,4 +22,3 @@
return false;
}
}
-
diff --git a/tests/040-miranda/src/MirandaClass2.java b/tests/040-miranda/src/MirandaClass2.java
index 4c07bd9..e9bdf2b 100644
--- a/tests/040-miranda/src/MirandaClass2.java
+++ b/tests/040-miranda/src/MirandaClass2.java
@@ -7,4 +7,3 @@
return 28;
}
}
-
diff --git a/tests/040-miranda/src/MirandaInterface.java b/tests/040-miranda/src/MirandaInterface.java
index a7c89fd..2c0a59a 100644
--- a/tests/040-miranda/src/MirandaInterface.java
+++ b/tests/040-miranda/src/MirandaInterface.java
@@ -8,4 +8,3 @@
public boolean inInterface();
}
-
diff --git a/tests/040-miranda/src/MirandaInterface2.java b/tests/040-miranda/src/MirandaInterface2.java
index f0187c6..83b6af8 100644
--- a/tests/040-miranda/src/MirandaInterface2.java
+++ b/tests/040-miranda/src/MirandaInterface2.java
@@ -10,4 +10,3 @@
public int inInterface2();
}
-
diff --git a/tests/042-new-instance/src/Main.java b/tests/042-new-instance/src/Main.java
index 037aa2a..8faef13 100644
--- a/tests/042-new-instance/src/Main.java
+++ b/tests/042-new-instance/src/Main.java
@@ -154,4 +154,3 @@
}
}
}
-
diff --git a/tests/042-new-instance/src/MaybeAbstract.java b/tests/042-new-instance/src/MaybeAbstract.java
index 43c002b..6d3b05b 100644
--- a/tests/042-new-instance/src/MaybeAbstract.java
+++ b/tests/042-new-instance/src/MaybeAbstract.java
@@ -18,4 +18,3 @@
public MaybeAbstract() {}
int foo() { return 0; }
}
-
diff --git a/tests/042-new-instance/src2/MaybeAbstract.java b/tests/042-new-instance/src2/MaybeAbstract.java
index bfbfd45..8b70a07 100644
--- a/tests/042-new-instance/src2/MaybeAbstract.java
+++ b/tests/042-new-instance/src2/MaybeAbstract.java
@@ -18,4 +18,3 @@
public MaybeAbstract() {}
int foo() { return 0; }
}
-
diff --git a/tests/043-privates/src/Main.java b/tests/043-privates/src/Main.java
index 9c4d357..73b4d79 100644
--- a/tests/043-privates/src/Main.java
+++ b/tests/043-privates/src/Main.java
@@ -43,4 +43,3 @@
return "PrivatePackageSub!";
}
}
-
diff --git a/tests/044-proxy/src/BasicTest.java b/tests/044-proxy/src/BasicTest.java
index 1633812..2a453c4 100644
--- a/tests/044-proxy/src/BasicTest.java
+++ b/tests/044-proxy/src/BasicTest.java
@@ -261,4 +261,3 @@
return result;
}
}
-
diff --git a/tests/044-proxy/src/Clash.java b/tests/044-proxy/src/Clash.java
index 31a9d2f..adeffdc 100644
--- a/tests/044-proxy/src/Clash.java
+++ b/tests/044-proxy/src/Clash.java
@@ -68,4 +68,3 @@
return null;
}
}
-
diff --git a/tests/044-proxy/src/Clash2.java b/tests/044-proxy/src/Clash2.java
index 44ffe47..2a384f4 100644
--- a/tests/044-proxy/src/Clash2.java
+++ b/tests/044-proxy/src/Clash2.java
@@ -58,4 +58,3 @@
return null;
}
}
-
diff --git a/tests/044-proxy/src/Clash3.java b/tests/044-proxy/src/Clash3.java
index ce323da..6d6f2f2 100644
--- a/tests/044-proxy/src/Clash3.java
+++ b/tests/044-proxy/src/Clash3.java
@@ -73,4 +73,3 @@
return null;
}
}
-
diff --git a/tests/044-proxy/src/Clash4.java b/tests/044-proxy/src/Clash4.java
index f200573..1bfb37f 100644
--- a/tests/044-proxy/src/Clash4.java
+++ b/tests/044-proxy/src/Clash4.java
@@ -75,4 +75,3 @@
return null;
}
}
-
diff --git a/tests/044-proxy/src/Main.java b/tests/044-proxy/src/Main.java
index 64ba9b8..01926af 100644
--- a/tests/044-proxy/src/Main.java
+++ b/tests/044-proxy/src/Main.java
@@ -27,4 +27,3 @@
WrappedThrow.main(null);
}
}
-
diff --git a/tests/044-proxy/src/WrappedThrow.java b/tests/044-proxy/src/WrappedThrow.java
index ea4af24..27ae84e 100644
--- a/tests/044-proxy/src/WrappedThrow.java
+++ b/tests/044-proxy/src/WrappedThrow.java
@@ -242,4 +242,3 @@
return result;
}
}
-
diff --git a/tests/045-reflect-array/src/Main.java b/tests/045-reflect-array/src/Main.java
index 1be05dd..c70e291 100644
--- a/tests/045-reflect-array/src/Main.java
+++ b/tests/045-reflect-array/src/Main.java
@@ -145,4 +145,3 @@
System.out.println("ReflectArrayTest.testMulti passed");
}
}
-
diff --git a/tests/046-reflect/src/Main.java b/tests/046-reflect/src/Main.java
index 99b1c4e..399a417 100644
--- a/tests/046-reflect/src/Main.java
+++ b/tests/046-reflect/src/Main.java
@@ -433,4 +433,3 @@
}
public void createNoisyInit(NoisyInit ni) {}
}
-
diff --git a/tests/047-returns/src/Main.java b/tests/047-returns/src/Main.java
index dc8ed76..d53c4a7 100644
--- a/tests/047-returns/src/Main.java
+++ b/tests/047-returns/src/Main.java
@@ -63,4 +63,3 @@
interface CommonInterface {
int doStuff();
}
-
diff --git a/tests/048-server-socket/src/Main.java b/tests/048-server-socket/src/Main.java
index b21210a..55dbf9a 100644
--- a/tests/048-server-socket/src/Main.java
+++ b/tests/048-server-socket/src/Main.java
@@ -50,4 +50,3 @@
System.out.println("done");
}
}
-
diff --git a/tests/049-show-object/src/Main.java b/tests/049-show-object/src/Main.java
index 60a4cef..d31eeda 100644
--- a/tests/049-show-object/src/Main.java
+++ b/tests/049-show-object/src/Main.java
@@ -32,4 +32,3 @@
showObject(array);
}
}
-
diff --git a/tests/050-sync-test/src/Main.java b/tests/050-sync-test/src/Main.java
index 6347706..c2ea192 100644
--- a/tests/050-sync-test/src/Main.java
+++ b/tests/050-sync-test/src/Main.java
@@ -177,4 +177,3 @@
}
}
}
-
diff --git a/tests/050-sync-test/src/ThreadDeathHandler.java b/tests/050-sync-test/src/ThreadDeathHandler.java
index 3f42f4d..5ea61a5 100644
--- a/tests/050-sync-test/src/ThreadDeathHandler.java
+++ b/tests/050-sync-test/src/ThreadDeathHandler.java
@@ -17,4 +17,3 @@
e.printStackTrace();
}
}
-
diff --git a/tests/051-thread/src/Main.java b/tests/051-thread/src/Main.java
index 7873596..9acc89e 100644
--- a/tests/051-thread/src/Main.java
+++ b/tests/051-thread/src/Main.java
@@ -71,4 +71,3 @@
}
}
}
-
diff --git a/tests/052-verifier-fun/src/Main.java b/tests/052-verifier-fun/src/Main.java
index 81ff654..ca960cf 100644
--- a/tests/052-verifier-fun/src/Main.java
+++ b/tests/052-verifier-fun/src/Main.java
@@ -107,4 +107,3 @@
feature.doStuff();
}
}
-
diff --git a/tests/053-wait-some/src/Main.java b/tests/053-wait-some/src/Main.java
index 7f703c7..51e6c52 100644
--- a/tests/053-wait-some/src/Main.java
+++ b/tests/053-wait-some/src/Main.java
@@ -69,4 +69,3 @@
}
}
}
-
diff --git a/tests/054-uncaught/src/ThreadDeathHandler.java b/tests/054-uncaught/src/ThreadDeathHandler.java
index 3f42f4d..5ea61a5 100644
--- a/tests/054-uncaught/src/ThreadDeathHandler.java
+++ b/tests/054-uncaught/src/ThreadDeathHandler.java
@@ -17,4 +17,3 @@
e.printStackTrace();
}
}
-
diff --git a/tests/064-field-access/src/GetNonexistent.java b/tests/064-field-access/src/GetNonexistent.java
index b979eb2..faad686 100644
--- a/tests/064-field-access/src/GetNonexistent.java
+++ b/tests/064-field-access/src/GetNonexistent.java
@@ -19,4 +19,3 @@
Object obj = Holder.mObject;
}
}
-
diff --git a/tests/064-field-access/src/Holder.java b/tests/064-field-access/src/Holder.java
index 5ae9f71..5e34024 100644
--- a/tests/064-field-access/src/Holder.java
+++ b/tests/064-field-access/src/Holder.java
@@ -17,4 +17,3 @@
public class Holder {
public static Object mObject = new Object();
}
-
diff --git a/tests/064-field-access/src/Main.java b/tests/064-field-access/src/Main.java
index 300c6b2..c068d23 100644
--- a/tests/064-field-access/src/Main.java
+++ b/tests/064-field-access/src/Main.java
@@ -343,4 +343,3 @@
}
}
-
diff --git a/tests/064-field-access/src/other/OtherPackage.java b/tests/064-field-access/src/other/OtherPackage.java
index 49f0d78..a595db5 100644
--- a/tests/064-field-access/src/other/OtherPackage.java
+++ b/tests/064-field-access/src/other/OtherPackage.java
@@ -13,4 +13,3 @@
double pkgDoubleField = 3.141592654;
}
-
diff --git a/tests/064-field-access/src2/Holder.java b/tests/064-field-access/src2/Holder.java
index dcb63eb..28224d7 100644
--- a/tests/064-field-access/src2/Holder.java
+++ b/tests/064-field-access/src2/Holder.java
@@ -17,4 +17,3 @@
public class Holder {
//public static Object mObject = new Object();
}
-
diff --git a/tests/065-mismatched-implements/src/Base.java b/tests/065-mismatched-implements/src/Base.java
index 7e35408..8623ad7 100644
--- a/tests/065-mismatched-implements/src/Base.java
+++ b/tests/065-mismatched-implements/src/Base.java
@@ -5,4 +5,3 @@
System.out.println("whee");
}
};
-
diff --git a/tests/065-mismatched-implements/src/Defs.java b/tests/065-mismatched-implements/src/Defs.java
index 456b6bf..bab92d8 100644
--- a/tests/065-mismatched-implements/src/Defs.java
+++ b/tests/065-mismatched-implements/src/Defs.java
@@ -5,4 +5,3 @@
// func2 not defined
}
-
diff --git a/tests/065-mismatched-implements/src/Indirect.java b/tests/065-mismatched-implements/src/Indirect.java
index dd87a65..023e409 100644
--- a/tests/065-mismatched-implements/src/Indirect.java
+++ b/tests/065-mismatched-implements/src/Indirect.java
@@ -25,4 +25,3 @@
Base base = new Base();
}
}
-
diff --git a/tests/065-mismatched-implements/src/Main.java b/tests/065-mismatched-implements/src/Main.java
index 6993b17..5975b99 100644
--- a/tests/065-mismatched-implements/src/Main.java
+++ b/tests/065-mismatched-implements/src/Main.java
@@ -27,4 +27,3 @@
}
}
}
-
diff --git a/tests/065-mismatched-implements/src2/Defs.java b/tests/065-mismatched-implements/src2/Defs.java
index a630c90..e7eb8a1 100644
--- a/tests/065-mismatched-implements/src2/Defs.java
+++ b/tests/065-mismatched-implements/src2/Defs.java
@@ -9,4 +9,3 @@
System.out.println("yo yo");
}
}
-
diff --git a/tests/066-mismatched-super/src/Base.java b/tests/066-mismatched-super/src/Base.java
index 815f974..6180c8b 100644
--- a/tests/066-mismatched-super/src/Base.java
+++ b/tests/066-mismatched-super/src/Base.java
@@ -3,4 +3,3 @@
public class Base extends Defs {
// no need to implement func(), provided by abstract class
};
-
diff --git a/tests/066-mismatched-super/src/Defs.java b/tests/066-mismatched-super/src/Defs.java
index a630c90..e7eb8a1 100644
--- a/tests/066-mismatched-super/src/Defs.java
+++ b/tests/066-mismatched-super/src/Defs.java
@@ -9,4 +9,3 @@
System.out.println("yo yo");
}
}
-
diff --git a/tests/066-mismatched-super/src/Indirect.java b/tests/066-mismatched-super/src/Indirect.java
index dd87a65..023e409 100644
--- a/tests/066-mismatched-super/src/Indirect.java
+++ b/tests/066-mismatched-super/src/Indirect.java
@@ -25,4 +25,3 @@
Base base = new Base();
}
}
-
diff --git a/tests/066-mismatched-super/src/Main.java b/tests/066-mismatched-super/src/Main.java
index 6993b17..5975b99 100644
--- a/tests/066-mismatched-super/src/Main.java
+++ b/tests/066-mismatched-super/src/Main.java
@@ -27,4 +27,3 @@
}
}
}
-
diff --git a/tests/066-mismatched-super/src2/Defs.java b/tests/066-mismatched-super/src2/Defs.java
index 456b6bf..bab92d8 100644
--- a/tests/066-mismatched-super/src2/Defs.java
+++ b/tests/066-mismatched-super/src2/Defs.java
@@ -5,4 +5,3 @@
// func2 not defined
}
-
diff --git a/tests/068-classloader/src-ex/AbstractGet.java b/tests/068-classloader/src-ex/AbstractGet.java
index b62aa8f..db13b32 100644
--- a/tests/068-classloader/src-ex/AbstractGet.java
+++ b/tests/068-classloader/src-ex/AbstractGet.java
@@ -30,4 +30,3 @@
abstract class AbstractBase extends BaseOkay {
public abstract DoubledExtendOkay getExtended();
}
-
diff --git a/tests/068-classloader/src-ex/DoubledExtend.java b/tests/068-classloader/src-ex/DoubledExtend.java
index 17da2c2..6ad2708 100644
--- a/tests/068-classloader/src-ex/DoubledExtend.java
+++ b/tests/068-classloader/src-ex/DoubledExtend.java
@@ -18,4 +18,3 @@
return "DoubledExtend 2";
}
}
-
diff --git a/tests/068-classloader/src-ex/DoubledExtendOkay.java b/tests/068-classloader/src-ex/DoubledExtendOkay.java
index 766fa8e..9674875 100644
--- a/tests/068-classloader/src-ex/DoubledExtendOkay.java
+++ b/tests/068-classloader/src-ex/DoubledExtendOkay.java
@@ -34,4 +34,3 @@
return "DoubledExtendOkay 2";
}
}
-
diff --git a/tests/068-classloader/src-ex/DoubledImplement.java b/tests/068-classloader/src-ex/DoubledImplement.java
index b479d8f..5c44fc3 100644
--- a/tests/068-classloader/src-ex/DoubledImplement.java
+++ b/tests/068-classloader/src-ex/DoubledImplement.java
@@ -16,4 +16,3 @@
System.out.println("DoubledImplement two");
}
}
-
diff --git a/tests/068-classloader/src-ex/DoubledImplement2.java b/tests/068-classloader/src-ex/DoubledImplement2.java
index 60e820f..24ecb65 100644
--- a/tests/068-classloader/src-ex/DoubledImplement2.java
+++ b/tests/068-classloader/src-ex/DoubledImplement2.java
@@ -30,4 +30,3 @@
System.out.println("DoubledImplement2 two");
}
}
-
diff --git a/tests/068-classloader/src-ex/GetDoubled.java b/tests/068-classloader/src-ex/GetDoubled.java
index 5e20441..28ada1e 100644
--- a/tests/068-classloader/src-ex/GetDoubled.java
+++ b/tests/068-classloader/src-ex/GetDoubled.java
@@ -24,4 +24,3 @@
return new DoubledExtendOkay();
}
}
-
diff --git a/tests/068-classloader/src-ex/IfaceImpl.java b/tests/068-classloader/src-ex/IfaceImpl.java
index 94a3bb0..7e9c27d 100644
--- a/tests/068-classloader/src-ex/IfaceImpl.java
+++ b/tests/068-classloader/src-ex/IfaceImpl.java
@@ -19,4 +19,3 @@
return new DoubledImplement2();
}
}
-
diff --git a/tests/068-classloader/src-ex/IfaceSub.java b/tests/068-classloader/src-ex/IfaceSub.java
index cb932bb..7e512e7 100644
--- a/tests/068-classloader/src-ex/IfaceSub.java
+++ b/tests/068-classloader/src-ex/IfaceSub.java
@@ -17,4 +17,3 @@
public interface IfaceSub extends IfaceSuper {
public DoubledImplement2 getDoubledInstance2();
}
-
diff --git a/tests/068-classloader/src-ex/Inaccessible1.java b/tests/068-classloader/src-ex/Inaccessible1.java
index 7b28427..415a8a1 100644
--- a/tests/068-classloader/src-ex/Inaccessible1.java
+++ b/tests/068-classloader/src-ex/Inaccessible1.java
@@ -9,4 +9,3 @@
System.out.println("--- inaccessible1");
}
}
-
diff --git a/tests/068-classloader/src-ex/Inaccessible2.java b/tests/068-classloader/src-ex/Inaccessible2.java
index b612bfa..dc20c21 100644
--- a/tests/068-classloader/src-ex/Inaccessible2.java
+++ b/tests/068-classloader/src-ex/Inaccessible2.java
@@ -8,4 +8,3 @@
System.out.println("--- inaccessible2");
}
}
-
diff --git a/tests/068-classloader/src-ex/Inaccessible3.java b/tests/068-classloader/src-ex/Inaccessible3.java
index 75a01be..771d0f7 100644
--- a/tests/068-classloader/src-ex/Inaccessible3.java
+++ b/tests/068-classloader/src-ex/Inaccessible3.java
@@ -8,4 +8,3 @@
System.out.println("--- inaccessible3");
}
}
-
diff --git a/tests/068-classloader/src/Base.java b/tests/068-classloader/src/Base.java
index 37bc1f2..b297a8a 100644
--- a/tests/068-classloader/src/Base.java
+++ b/tests/068-classloader/src/Base.java
@@ -14,4 +14,3 @@
return dt.getStr();
}
}
-
diff --git a/tests/068-classloader/src/BaseOkay.java b/tests/068-classloader/src/BaseOkay.java
index c5c3f7a..48b7796 100644
--- a/tests/068-classloader/src/BaseOkay.java
+++ b/tests/068-classloader/src/BaseOkay.java
@@ -36,4 +36,3 @@
interface IDoubledExtendOkay {
public DoubledExtendOkay getExtended();
}
-
diff --git a/tests/068-classloader/src/DoubledExtend.java b/tests/068-classloader/src/DoubledExtend.java
index 44c2bce..5f8ebc2 100644
--- a/tests/068-classloader/src/DoubledExtend.java
+++ b/tests/068-classloader/src/DoubledExtend.java
@@ -18,4 +18,3 @@
return "DoubledExtend 1";
}
}
-
diff --git a/tests/068-classloader/src/DoubledExtendOkay.java b/tests/068-classloader/src/DoubledExtendOkay.java
index e8ff404..e226e5f 100644
--- a/tests/068-classloader/src/DoubledExtendOkay.java
+++ b/tests/068-classloader/src/DoubledExtendOkay.java
@@ -34,4 +34,3 @@
return "DoubledExtendOkay 1";
}
}
-
diff --git a/tests/068-classloader/src/DoubledImplement.java b/tests/068-classloader/src/DoubledImplement.java
index 5568a43..64ec5e2 100644
--- a/tests/068-classloader/src/DoubledImplement.java
+++ b/tests/068-classloader/src/DoubledImplement.java
@@ -16,4 +16,3 @@
System.out.println("DoubledImplement one");
}
}
-
diff --git a/tests/068-classloader/src/DoubledImplement2.java b/tests/068-classloader/src/DoubledImplement2.java
index 5e18315..12c036c 100644
--- a/tests/068-classloader/src/DoubledImplement2.java
+++ b/tests/068-classloader/src/DoubledImplement2.java
@@ -30,4 +30,3 @@
System.out.println("DoubledImplement2 one");
}
}
-
diff --git a/tests/068-classloader/src/FancyLoader.java b/tests/068-classloader/src/FancyLoader.java
index 926c92e..173b08f 100644
--- a/tests/068-classloader/src/FancyLoader.java
+++ b/tests/068-classloader/src/FancyLoader.java
@@ -226,4 +226,3 @@
return res;
}
}
-
diff --git a/tests/068-classloader/src/ICommon.java b/tests/068-classloader/src/ICommon.java
index 4eac9be..35a98cc 100644
--- a/tests/068-classloader/src/ICommon.java
+++ b/tests/068-classloader/src/ICommon.java
@@ -6,4 +6,3 @@
public interface ICommon {
public DoubledImplement getDoubledInstance();
}
-
diff --git a/tests/068-classloader/src/ICommon2.java b/tests/068-classloader/src/ICommon2.java
index 13b2c23..6d81afc 100644
--- a/tests/068-classloader/src/ICommon2.java
+++ b/tests/068-classloader/src/ICommon2.java
@@ -20,4 +20,3 @@
public interface ICommon2 {
public DoubledImplement2 getDoubledInstance2();
}
-
diff --git a/tests/068-classloader/src/IGetDoubled.java b/tests/068-classloader/src/IGetDoubled.java
index 0a4ac91..08cd1ce 100644
--- a/tests/068-classloader/src/IGetDoubled.java
+++ b/tests/068-classloader/src/IGetDoubled.java
@@ -20,4 +20,3 @@
public interface IGetDoubled {
public DoubledExtendOkay getDoubled();
}
-
diff --git a/tests/068-classloader/src/IfaceSuper.java b/tests/068-classloader/src/IfaceSuper.java
index f01963a..36d278c 100644
--- a/tests/068-classloader/src/IfaceSuper.java
+++ b/tests/068-classloader/src/IfaceSuper.java
@@ -17,4 +17,3 @@
public interface IfaceSuper {
public DoubledImplement2 getDoubledInstance2();
}
-
diff --git a/tests/068-classloader/src/InaccessibleBase.java b/tests/068-classloader/src/InaccessibleBase.java
index d43ea00..83af665 100644
--- a/tests/068-classloader/src/InaccessibleBase.java
+++ b/tests/068-classloader/src/InaccessibleBase.java
@@ -5,4 +5,3 @@
*/
class InaccessibleBase {
}
-
diff --git a/tests/068-classloader/src/InaccessibleInterface.java b/tests/068-classloader/src/InaccessibleInterface.java
index 6df7501..7f52b80 100644
--- a/tests/068-classloader/src/InaccessibleInterface.java
+++ b/tests/068-classloader/src/InaccessibleInterface.java
@@ -5,4 +5,3 @@
*/
interface InaccessibleInterface {
}
-
diff --git a/tests/068-classloader/src/Main.java b/tests/068-classloader/src/Main.java
index 0788b52..1bc7b04 100644
--- a/tests/068-classloader/src/Main.java
+++ b/tests/068-classloader/src/Main.java
@@ -423,4 +423,3 @@
di2.one();
}
}
-
diff --git a/tests/068-classloader/src/SimpleBase.java b/tests/068-classloader/src/SimpleBase.java
index 5e1fb5a..fd56db9 100644
--- a/tests/068-classloader/src/SimpleBase.java
+++ b/tests/068-classloader/src/SimpleBase.java
@@ -6,4 +6,3 @@
public class SimpleBase {
public SimpleBase() {}
}
-
diff --git a/tests/069-field-type/info.txt b/tests/069-field-type/info.txt
index 58db32e..6e3a22f 100644
--- a/tests/069-field-type/info.txt
+++ b/tests/069-field-type/info.txt
@@ -2,4 +2,3 @@
inappropriate object type in an instance field. By compiling two
versions of the field-holder class we can bypass the compiler's type
safety.
-
diff --git a/tests/069-field-type/src/Blah.java b/tests/069-field-type/src/Blah.java
index 932f276..fd98336 100644
--- a/tests/069-field-type/src/Blah.java
+++ b/tests/069-field-type/src/Blah.java
@@ -7,4 +7,3 @@
System.out.println("run");
}
}
-
diff --git a/tests/069-field-type/src/Holder.java b/tests/069-field-type/src/Holder.java
index ec56e69..e3c9f89 100644
--- a/tests/069-field-type/src/Holder.java
+++ b/tests/069-field-type/src/Holder.java
@@ -5,4 +5,3 @@
public class Holder {
public Runnable mValue;
}
-
diff --git a/tests/069-field-type/src/Main.java b/tests/069-field-type/src/Main.java
index 72268e9..f9885e6 100644
--- a/tests/069-field-type/src/Main.java
+++ b/tests/069-field-type/src/Main.java
@@ -32,4 +32,3 @@
System.out.println("Done");
}
}
-
diff --git a/tests/069-field-type/src2/Blah.java b/tests/069-field-type/src2/Blah.java
index b40e732..1bffff6 100644
--- a/tests/069-field-type/src2/Blah.java
+++ b/tests/069-field-type/src2/Blah.java
@@ -8,4 +8,3 @@
return 0;
}
}
-
diff --git a/tests/070-nio-buffer/src/Main.java b/tests/070-nio-buffer/src/Main.java
index ffc9e27..bfcab3a 100644
--- a/tests/070-nio-buffer/src/Main.java
+++ b/tests/070-nio-buffer/src/Main.java
@@ -95,4 +95,3 @@
int1.position (0);
}
}
-
diff --git a/tests/071-dexfile/src-ex/Another.java b/tests/071-dexfile/src-ex/Another.java
index e732b5b..c978c59 100644
--- a/tests/071-dexfile/src-ex/Another.java
+++ b/tests/071-dexfile/src-ex/Another.java
@@ -26,4 +26,3 @@
}
}
}
-
diff --git a/tests/071-dexfile/src/Main.java b/tests/071-dexfile/src/Main.java
index 42c841d..d71aec0 100644
--- a/tests/071-dexfile/src/Main.java
+++ b/tests/071-dexfile/src/Main.java
@@ -143,4 +143,3 @@
return (ClassLoader) dclObj;
}
}
-
diff --git a/tests/072-precise-gc/src/Main.java b/tests/072-precise-gc/src/Main.java
index 9b2315d..e049221 100644
--- a/tests/072-precise-gc/src/Main.java
+++ b/tests/072-precise-gc/src/Main.java
@@ -111,4 +111,3 @@
System.out.println(str0+str1+str2+str3+str4+str5+str6+str7+str8+str9);
}
}
-
diff --git a/tests/073-mismatched-field/src/IMain.java b/tests/073-mismatched-field/src/IMain.java
index 301dd21..3ad5ecb 100644
--- a/tests/073-mismatched-field/src/IMain.java
+++ b/tests/073-mismatched-field/src/IMain.java
@@ -17,4 +17,3 @@
public interface IMain {
//static int f = 123;
}
-
diff --git a/tests/073-mismatched-field/src/Main.java b/tests/073-mismatched-field/src/Main.java
index fb9f32a..70709c0 100644
--- a/tests/073-mismatched-field/src/Main.java
+++ b/tests/073-mismatched-field/src/Main.java
@@ -29,4 +29,3 @@
}
}
}
-
diff --git a/tests/073-mismatched-field/src/SuperMain.java b/tests/073-mismatched-field/src/SuperMain.java
index 7447739..48a9bab 100644
--- a/tests/073-mismatched-field/src/SuperMain.java
+++ b/tests/073-mismatched-field/src/SuperMain.java
@@ -17,4 +17,3 @@
public class SuperMain {
public int f = 456;
}
-
diff --git a/tests/073-mismatched-field/src2/IMain.java b/tests/073-mismatched-field/src2/IMain.java
index 585c738..136f2a1 100644
--- a/tests/073-mismatched-field/src2/IMain.java
+++ b/tests/073-mismatched-field/src2/IMain.java
@@ -17,4 +17,3 @@
public interface IMain {
static int f = 123;
}
-
diff --git a/tests/074-gc-thrash/info.txt b/tests/074-gc-thrash/info.txt
index c195adb..ded1582 100644
--- a/tests/074-gc-thrash/info.txt
+++ b/tests/074-gc-thrash/info.txt
@@ -1,2 +1 @@
This thrashes the memory allocator and garbage collector for a brief period.
-
diff --git a/tests/074-gc-thrash/src/Main.java b/tests/074-gc-thrash/src/Main.java
index f79e5ce..f85aa4b 100644
--- a/tests/074-gc-thrash/src/Main.java
+++ b/tests/074-gc-thrash/src/Main.java
@@ -335,4 +335,3 @@
public void pretendToUse(byte[] chunk) {}
}
-
diff --git a/tests/075-verification-error/src/Main.java b/tests/075-verification-error/src/Main.java
index f357242..51d648c 100644
--- a/tests/075-verification-error/src/Main.java
+++ b/tests/075-verification-error/src/Main.java
@@ -146,4 +146,3 @@
}
}
}
-
diff --git a/tests/075-verification-error/src/MaybeAbstract.java b/tests/075-verification-error/src/MaybeAbstract.java
index 43c002b..6d3b05b 100644
--- a/tests/075-verification-error/src/MaybeAbstract.java
+++ b/tests/075-verification-error/src/MaybeAbstract.java
@@ -18,4 +18,3 @@
public MaybeAbstract() {}
int foo() { return 0; }
}
-
diff --git a/tests/075-verification-error/src/other/InaccessibleClass.java b/tests/075-verification-error/src/other/InaccessibleClass.java
index 254eaa3..b9bdfc4 100644
--- a/tests/075-verification-error/src/other/InaccessibleClass.java
+++ b/tests/075-verification-error/src/other/InaccessibleClass.java
@@ -21,4 +21,3 @@
public static int blah = 5;
}
-
diff --git a/tests/075-verification-error/src/other/InaccessibleMethod.java b/tests/075-verification-error/src/other/InaccessibleMethod.java
index 49a0b29..0460373 100644
--- a/tests/075-verification-error/src/other/InaccessibleMethod.java
+++ b/tests/075-verification-error/src/other/InaccessibleMethod.java
@@ -19,4 +19,3 @@
public class InaccessibleMethod {
public static void test() {}
}
-
diff --git a/tests/075-verification-error/src/other/Mutant.java b/tests/075-verification-error/src/other/Mutant.java
index 6c869c0..ec4754b 100644
--- a/tests/075-verification-error/src/other/Mutant.java
+++ b/tests/075-verification-error/src/other/Mutant.java
@@ -41,4 +41,3 @@
System.out.println("nay");
}
}
-
diff --git a/tests/075-verification-error/src2/MaybeAbstract.java b/tests/075-verification-error/src2/MaybeAbstract.java
index bfbfd45..8b70a07 100644
--- a/tests/075-verification-error/src2/MaybeAbstract.java
+++ b/tests/075-verification-error/src2/MaybeAbstract.java
@@ -18,4 +18,3 @@
public MaybeAbstract() {}
int foo() { return 0; }
}
-
diff --git a/tests/075-verification-error/src2/other/InaccessibleClass.java b/tests/075-verification-error/src2/other/InaccessibleClass.java
index a3cfbff..812fac9 100644
--- a/tests/075-verification-error/src2/other/InaccessibleClass.java
+++ b/tests/075-verification-error/src2/other/InaccessibleClass.java
@@ -21,4 +21,3 @@
public static int blah = 5;
}
-
diff --git a/tests/075-verification-error/src2/other/InaccessibleMethod.java b/tests/075-verification-error/src2/other/InaccessibleMethod.java
index 6e2738e..9fb844e 100644
--- a/tests/075-verification-error/src2/other/InaccessibleMethod.java
+++ b/tests/075-verification-error/src2/other/InaccessibleMethod.java
@@ -19,4 +19,3 @@
public class InaccessibleMethod {
/*package*/ static void test() {}
}
-
diff --git a/tests/075-verification-error/src2/other/Mutant.java b/tests/075-verification-error/src2/other/Mutant.java
index 220fda0..67cd36d 100644
--- a/tests/075-verification-error/src2/other/Mutant.java
+++ b/tests/075-verification-error/src2/other/Mutant.java
@@ -41,5 +41,3 @@
System.out.println("nay");
}
}
-
-
diff --git a/tests/077-method-override/src/Base.java b/tests/077-method-override/src/Base.java
index eed6f22..befe2e2 100644
--- a/tests/077-method-override/src/Base.java
+++ b/tests/077-method-override/src/Base.java
@@ -81,4 +81,3 @@
System.out.println("overrideStaticWithVirtual: Base");
}
}
-
diff --git a/tests/077-method-override/src/Derived.java b/tests/077-method-override/src/Derived.java
index 09ffdf6..7dc43d0 100644
--- a/tests/077-method-override/src/Derived.java
+++ b/tests/077-method-override/src/Derived.java
@@ -57,4 +57,3 @@
System.out.println("overrideStaticWithVirtual: Derived");
}
}
-
diff --git a/tests/077-method-override/src/Main.java b/tests/077-method-override/src/Main.java
index fa401cd..2d10ee0 100644
--- a/tests/077-method-override/src/Main.java
+++ b/tests/077-method-override/src/Main.java
@@ -51,4 +51,3 @@
}
}
}
-
diff --git a/tests/077-method-override/src2/Base.java b/tests/077-method-override/src2/Base.java
index 8be42bc..ab2a28b 100644
--- a/tests/077-method-override/src2/Base.java
+++ b/tests/077-method-override/src2/Base.java
@@ -80,4 +80,3 @@
System.out.println("overrideStaticWithVirtual: Base");
}
}
-
diff --git a/tests/079-phantom/src/Bitmap.java b/tests/079-phantom/src/Bitmap.java
index 4d9c259..9d03cbd 100644
--- a/tests/079-phantom/src/Bitmap.java
+++ b/tests/079-phantom/src/Bitmap.java
@@ -150,4 +150,3 @@
interrupt();
}
}
-
diff --git a/tests/079-phantom/src/Main.java b/tests/079-phantom/src/Main.java
index 3965481..9c459c9 100644
--- a/tests/079-phantom/src/Main.java
+++ b/tests/079-phantom/src/Main.java
@@ -83,4 +83,3 @@
mBitmap3 = mBitmap4 = new Bitmap("three/four", 20, 20, dataB);
}
}
-
diff --git a/tests/084-class-init/src/IntHolder.java b/tests/084-class-init/src/IntHolder.java
index 809a142..4012d6e 100644
--- a/tests/084-class-init/src/IntHolder.java
+++ b/tests/084-class-init/src/IntHolder.java
@@ -39,4 +39,3 @@
mValue = val;
}
}
-
diff --git a/tests/084-class-init/src/Main.java b/tests/084-class-init/src/Main.java
index 0f17ad1..89b76f5 100644
--- a/tests/084-class-init/src/Main.java
+++ b/tests/084-class-init/src/Main.java
@@ -91,4 +91,3 @@
}
}
}
-
diff --git a/tests/084-class-init/src/PartialInit.java b/tests/084-class-init/src/PartialInit.java
index 59ce946..d4c71ff 100644
--- a/tests/084-class-init/src/PartialInit.java
+++ b/tests/084-class-init/src/PartialInit.java
@@ -22,4 +22,3 @@
public static final IntHolder FIELD0 = new IntHolder(1); // succeeds
public static final IntHolder FIELD1 = new IntHolder(-2); // throws
}
-
diff --git a/tests/084-class-init/src/SlowInit.java b/tests/084-class-init/src/SlowInit.java
index 3d677cc..8ac72be 100644
--- a/tests/084-class-init/src/SlowInit.java
+++ b/tests/084-class-init/src/SlowInit.java
@@ -38,4 +38,3 @@
FIELD3.setValue(444);
};
}
-
diff --git a/tests/README.txt b/tests/README.txt
index 276abbd..eb1ce36 100644
--- a/tests/README.txt
+++ b/tests/README.txt
@@ -11,4 +11,3 @@
directory; this can be used to exercise "API mismatch" situations by
replacing class files created in the first pass. The "src-ex" directory
is built separately, and is intended for exercising class loaders.
-
diff --git a/tests/etc/default-build b/tests/etc/default-build
index b0bf491..b8df442 100755
--- a/tests/etc/default-build
+++ b/tests/etc/default-build
@@ -41,4 +41,3 @@
mv classes.dex classes-ex.dex
mv classes-1.dex classes.dex
fi
-
diff --git a/tests/run-all-tests b/tests/run-all-tests
index 3069e34..ac01803 100755
--- a/tests/run-all-tests
+++ b/tests/run-all-tests
@@ -122,4 +122,3 @@
for i in $failNames; do
echo "failed: $i"
done
-
diff --git a/tools/dexcheck b/tools/dexcheck
index ff3e98d..3e2f6f6 100755
--- a/tools/dexcheck
+++ b/tools/dexcheck
@@ -43,4 +43,3 @@
done
exit $failure
-
diff --git a/tools/dexdeps/README.txt b/tools/dexdeps/README.txt
index 14d65b0..060aecb 100644
--- a/tools/dexdeps/README.txt
+++ b/tools/dexdeps/README.txt
@@ -25,4 +25,3 @@
"xml" produces a larger output file, readable with an XML browser. Types
are shown in a more human-readable form (e.g. "[I" becomes "int[]").
-
diff --git a/tools/dexdeps/src/Android.mk b/tools/dexdeps/src/Android.mk
index 756a0b3..7c0ef2f 100644
--- a/tools/dexdeps/src/Android.mk
+++ b/tools/dexdeps/src/Android.mk
@@ -29,4 +29,3 @@
INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
include $(BUILD_DROIDDOC)
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/ClassRef.java b/tools/dexdeps/src/com/android/dexdeps/ClassRef.java
index 8065a0a..7f6edc9 100644
--- a/tools/dexdeps/src/com/android/dexdeps/ClassRef.java
+++ b/tools/dexdeps/src/com/android/dexdeps/ClassRef.java
@@ -67,4 +67,3 @@
return mClassName;
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/DexData.java b/tools/dexdeps/src/com/android/dexdeps/DexData.java
index 0a7fa2d..7ce5d04 100644
--- a/tools/dexdeps/src/com/android/dexdeps/DexData.java
+++ b/tools/dexdeps/src/com/android/dexdeps/DexData.java
@@ -591,4 +591,3 @@
public int classIdx; // index into type_ids
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/DexDataException.java b/tools/dexdeps/src/com/android/dexdeps/DexDataException.java
index e51853f..873db94 100644
--- a/tools/dexdeps/src/com/android/dexdeps/DexDataException.java
+++ b/tools/dexdeps/src/com/android/dexdeps/DexDataException.java
@@ -21,4 +21,3 @@
*/
public class DexDataException extends RuntimeException {
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/FieldRef.java b/tools/dexdeps/src/com/android/dexdeps/FieldRef.java
index 2726a7a..93e87cb 100644
--- a/tools/dexdeps/src/com/android/dexdeps/FieldRef.java
+++ b/tools/dexdeps/src/com/android/dexdeps/FieldRef.java
@@ -49,4 +49,3 @@
return mFieldName;
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/Main.java b/tools/dexdeps/src/com/android/dexdeps/Main.java
index b1f7f96..d48889d 100644
--- a/tools/dexdeps/src/com/android/dexdeps/Main.java
+++ b/tools/dexdeps/src/com/android/dexdeps/Main.java
@@ -200,4 +200,3 @@
System.err.println(" --format={xml,brief}");
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/MethodRef.java b/tools/dexdeps/src/com/android/dexdeps/MethodRef.java
index 96522eb..67dce62 100644
--- a/tools/dexdeps/src/com/android/dexdeps/MethodRef.java
+++ b/tools/dexdeps/src/com/android/dexdeps/MethodRef.java
@@ -85,4 +85,3 @@
return builder.toString();
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/Output.java b/tools/dexdeps/src/com/android/dexdeps/Output.java
index 122544c..b786825 100644
--- a/tools/dexdeps/src/com/android/dexdeps/Output.java
+++ b/tools/dexdeps/src/com/android/dexdeps/Output.java
@@ -298,4 +298,3 @@
}
}
}
-
diff --git a/tools/dexdeps/src/com/android/dexdeps/UsageException.java b/tools/dexdeps/src/com/android/dexdeps/UsageException.java
index f9f971b..e695fc7 100644
--- a/tools/dexdeps/src/com/android/dexdeps/UsageException.java
+++ b/tools/dexdeps/src/com/android/dexdeps/UsageException.java
@@ -21,4 +21,3 @@
*/
public class UsageException extends RuntimeException {
}
-
diff --git a/tools/dmtracedump/Android.mk b/tools/dmtracedump/Android.mk
index 2ba0a68..e3f321e 100644
--- a/tools/dmtracedump/Android.mk
+++ b/tools/dmtracedump/Android.mk
@@ -20,5 +20,3 @@
LOCAL_C_INCLUDES += dalvik/vm
LOCAL_MODULE := create_test_dmtrace
include $(BUILD_HOST_EXECUTABLE)
-
-
diff --git a/tools/dmtracedump/dmtracedump.pl b/tools/dmtracedump/dmtracedump.pl
index 9c3f40e..6e487c6 100755
--- a/tools/dmtracedump/dmtracedump.pl
+++ b/tools/dmtracedump/dmtracedump.pl
@@ -16,5 +16,3 @@
}
closedir DIR;
-
-
diff --git a/tools/dmtracedump/dumpdir.sh b/tools/dmtracedump/dumpdir.sh
index 34937d7..81992a2 100644
--- a/tools/dmtracedump/dumpdir.sh
+++ b/tools/dmtracedump/dumpdir.sh
@@ -9,4 +9,3 @@
G=$2/`echo $F | sed "s/.*\\///g"`.html
dmtracedump -h -p $F > $G
done
-
diff --git a/tools/gclog.py b/tools/gclog.py
index 4d5b704..d008f6a 100755
--- a/tools/gclog.py
+++ b/tools/gclog.py
@@ -232,4 +232,3 @@
start()
-
diff --git a/tools/gdbjithelper/README.txt b/tools/gdbjithelper/README.txt
index f34cb7c..aab1a00 100644
--- a/tools/gdbjithelper/README.txt
+++ b/tools/gdbjithelper/README.txt
@@ -63,4 +63,3 @@
Issue the following command to see code around LR
x /20i (char *) &codeLR+1
-
diff --git a/tools/hprof-conv/Android.mk b/tools/hprof-conv/Android.mk
index fbac5fa..3d39d7b 100644
--- a/tools/hprof-conv/Android.mk
+++ b/tools/hprof-conv/Android.mk
@@ -18,4 +18,3 @@
LOCAL_SRC_FILES := HprofConv.c
LOCAL_MODULE := hprof-conv
include $(BUILD_HOST_EXECUTABLE)
-
diff --git a/tools/hprof-conv/HprofConv.c b/tools/hprof-conv/HprofConv.c
index 88e302e..02cb7f4 100644
--- a/tools/hprof-conv/HprofConv.c
+++ b/tools/hprof-conv/HprofConv.c
@@ -716,4 +716,3 @@
fclose(out);
return (cc != 0);
}
-
diff --git a/vm/AllocTracker.c b/vm/AllocTracker.c
index 2846223..168713c 100644
--- a/vm/AllocTracker.c
+++ b/vm/AllocTracker.c
@@ -651,4 +651,3 @@
free(data);
}
}
-
diff --git a/vm/Atomic.c b/vm/Atomic.c
index 55b4cc9..5ea5250 100644
--- a/vm/Atomic.c
+++ b/vm/Atomic.c
@@ -222,4 +222,3 @@
}
#endif
-
diff --git a/vm/AtomicCache.c b/vm/AtomicCache.c
index cee84a8..f91de1e 100644
--- a/vm/AtomicCache.c
+++ b/vm/AtomicCache.c
@@ -170,4 +170,3 @@
(pCache->fail + pCache->hits + pCache->misses + pCache->fills),
pCache->numEntries);
}
-
diff --git a/vm/Ddm.c b/vm/Ddm.c
index 3cb8937..f76901f 100644
--- a/vm/Ddm.c
+++ b/vm/Ddm.c
@@ -595,4 +595,3 @@
memcpy(arrayObj->contents, data, len);
return arrayObj;
}
-
diff --git a/vm/DvmDex.c b/vm/DvmDex.c
index 258d768..aefdb81 100644
--- a/vm/DvmDex.c
+++ b/vm/DvmDex.c
@@ -288,4 +288,3 @@
return true;
}
-
diff --git a/vm/Exception.c b/vm/Exception.c
index d286f2a..96f34da 100644
--- a/vm/Exception.c
+++ b/vm/Exception.c
@@ -1304,4 +1304,3 @@
exception = cause;
}
}
-
diff --git a/vm/IndirectRefTable.c b/vm/IndirectRefTable.c
index 7a531a5..dadd03f 100644
--- a/vm/IndirectRefTable.c
+++ b/vm/IndirectRefTable.c
@@ -499,4 +499,3 @@
LOGW("Memory held directly by native code is %d bytes\n", total);
free(tableCopy);
}
-
diff --git a/vm/Inlines.c b/vm/Inlines.c
index e314448..f1bd621 100644
--- a/vm/Inlines.c
+++ b/vm/Inlines.c
@@ -26,4 +26,3 @@
#undef LOG_TAG
#include "jdwp/JdwpPriv.h"
-
diff --git a/vm/Inlines.h b/vm/Inlines.h
index cdfaf75..f1580e3 100644
--- a/vm/Inlines.h
+++ b/vm/Inlines.h
@@ -30,4 +30,3 @@
#else
# define INLINE
#endif
-
diff --git a/vm/JarFile.c b/vm/JarFile.c
index a0d24d1..39eb8d1 100644
--- a/vm/JarFile.c
+++ b/vm/JarFile.c
@@ -368,4 +368,3 @@
free(pJarFile->cacheFileName);
free(pJarFile);
}
-
diff --git a/vm/LinearAlloc.c b/vm/LinearAlloc.c
index 3a79a8b..65db79e 100644
--- a/vm/LinearAlloc.c
+++ b/vm/LinearAlloc.c
@@ -702,4 +702,3 @@
return (char*) start >= pHdr->mapAddr &&
((char*)start + length) <= (pHdr->mapAddr + pHdr->curOffset);
}
-
diff --git a/vm/Native.c b/vm/Native.c
index 83f32b4..0b10e23 100644
--- a/vm/Native.c
+++ b/vm/Native.c
@@ -815,4 +815,3 @@
return (void*) dvmHashForeach(gDvm.nativeLibs, findMethodInLib,
(void*) method);
}
-
diff --git a/vm/PointerSet.c b/vm/PointerSet.c
index 2c96a74..1d2e814 100644
--- a/vm/PointerSet.c
+++ b/vm/PointerSet.c
@@ -271,4 +271,3 @@
for (i = 0; i < pSet->count; i++)
printf(" %p", pSet->list[i]);
}
-
diff --git a/vm/README.txt b/vm/README.txt
index e00e240..1be1a63 100644
--- a/vm/README.txt
+++ b/vm/README.txt
@@ -17,4 +17,3 @@
work correctly.
- Use of gcc-specific and C99 constructs is allowed.
-
diff --git a/vm/RawDexFile.c b/vm/RawDexFile.c
index c55fee6..3402ff4 100644
--- a/vm/RawDexFile.c
+++ b/vm/RawDexFile.c
@@ -41,4 +41,3 @@
free(pRawDexFile->cacheFileName);
free(pRawDexFile);
}
-
diff --git a/vm/ReferenceTable.c b/vm/ReferenceTable.c
index 310669d..8984d5f 100644
--- a/vm/ReferenceTable.c
+++ b/vm/ReferenceTable.c
@@ -291,4 +291,3 @@
LOGW("Memory held directly by tracked refs is %d bytes\n", total);
free(tableCopy);
}
-
diff --git a/vm/StdioConverter.c b/vm/StdioConverter.c
index 520d984..987fdf0 100644
--- a/vm/StdioConverter.c
+++ b/vm/StdioConverter.c
@@ -286,4 +286,3 @@
return true;
}
-
diff --git a/vm/StdioConverter.h b/vm/StdioConverter.h
index eef4a72..ffbf807 100644
--- a/vm/StdioConverter.h
+++ b/vm/StdioConverter.h
@@ -23,4 +23,3 @@
void dvmStdioConverterShutdown(void);
#endif /*_DALVIK_STDOUTCONVERTER*/
-
diff --git a/vm/UtfString.c b/vm/UtfString.c
index 8e20a0f..da67fae 100644
--- a/vm/UtfString.c
+++ b/vm/UtfString.c
@@ -521,4 +521,3 @@
(const u2*) chars2->contents + offset2,
len1 * sizeof(u2));
}
-
diff --git a/vm/alloc/HeapTable.c b/vm/alloc/HeapTable.c
index 7d42600..eb8646b 100644
--- a/vm/alloc/HeapTable.c
+++ b/vm/alloc/HeapTable.c
@@ -216,5 +216,3 @@
table = table->next;
}
}
-
-
diff --git a/vm/alloc/clz.c b/vm/alloc/clz.c
index 2ec873e..3488975 100644
--- a/vm/alloc/clz.c
+++ b/vm/alloc/clz.c
@@ -47,4 +47,3 @@
return e;
#endif
}
-
diff --git a/vm/analysis/CodeVerify.c b/vm/analysis/CodeVerify.c
index fee0657..104974d 100644
--- a/vm/analysis/CodeVerify.c
+++ b/vm/analysis/CodeVerify.c
@@ -5832,4 +5832,3 @@
NULL, logLocalsCb, &addr);
}
}
-
diff --git a/vm/analysis/DexPrepare.c b/vm/analysis/DexPrepare.c
index 3cba906..144354a 100644
--- a/vm/analysis/DexPrepare.c
+++ b/vm/analysis/DexPrepare.c
@@ -1441,4 +1441,3 @@
adler = adler32(adler, addr + nonSum, len - nonSum);
pHeader->checksum = adler;
}
-
diff --git a/vm/analysis/DexVerify.c b/vm/analysis/DexVerify.c
index 8eced23..4c4df8f 100644
--- a/vm/analysis/DexVerify.c
+++ b/vm/analysis/DexVerify.c
@@ -681,4 +681,3 @@
return true;
}
-
diff --git a/vm/analysis/Optimize.c b/vm/analysis/Optimize.c
index 82d50cd..d334497 100644
--- a/vm/analysis/Optimize.c
+++ b/vm/analysis/Optimize.c
@@ -976,4 +976,3 @@
return false;
}
-
diff --git a/vm/analysis/ReduceConstants.c b/vm/analysis/ReduceConstants.c
index bdfdb80..69657e3 100644
--- a/vm/analysis/ReduceConstants.c
+++ b/vm/analysis/ReduceConstants.c
@@ -1057,4 +1057,3 @@
return pIndexMapSet;
}
-
diff --git a/vm/analysis/RegisterMap.c b/vm/analysis/RegisterMap.c
index 8ab37f0..cb008c5 100644
--- a/vm/analysis/RegisterMap.c
+++ b/vm/analysis/RegisterMap.c
@@ -3270,4 +3270,3 @@
}
#endif /*#if 0*/
-
diff --git a/vm/analysis/VerifySubs.c b/vm/analysis/VerifySubs.c
index 16f128e..b01a8bc 100644
--- a/vm/analysis/VerifySubs.c
+++ b/vm/analysis/VerifySubs.c
@@ -471,4 +471,3 @@
else
return kRegTypeInteger;
}
-
diff --git a/vm/arch/generic/Call.c b/vm/arch/generic/Call.c
index bb0b641..a39b761 100644
--- a/vm/arch/generic/Call.c
+++ b/vm/arch/generic/Call.c
@@ -102,4 +102,3 @@
ffi_call(&cif, FFI_FN(func), pReturn, values);
}
-
diff --git a/vm/compiler/codegen/arm/README.txt b/vm/compiler/codegen/arm/README.txt
index 6698ac3..a49eef8 100644
--- a/vm/compiler/codegen/arm/README.txt
+++ b/vm/compiler/codegen/arm/README.txt
@@ -46,4 +46,3 @@
In this way the dependency between generic and specific code tied to
particular architectures can be explicitly represented.
-
diff --git a/vm/compiler/template/armv5te-vfp/TEMPLATE_CMPG_DOUBLE_VFP.S b/vm/compiler/template/armv5te-vfp/TEMPLATE_CMPG_DOUBLE_VFP.S
index 1b143a9..992c894 100644
--- a/vm/compiler/template/armv5te-vfp/TEMPLATE_CMPG_DOUBLE_VFP.S
+++ b/vm/compiler/template/armv5te-vfp/TEMPLATE_CMPG_DOUBLE_VFP.S
@@ -31,4 +31,3 @@
mvnmi r0, #0 @ (less than) r0<- -1
moveq r0, #0 @ (equal) r0<- 0
bx lr
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_CMPL_DOUBLE.S b/vm/compiler/template/armv5te/TEMPLATE_CMPL_DOUBLE.S
index 01772b4..15988f6 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_CMPL_DOUBLE.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_CMPL_DOUBLE.S
@@ -34,4 +34,3 @@
bxcc r11
$naninst @ r1<- 1 or -1 for NaN
bx r11
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_CMPL_FLOAT.S b/vm/compiler/template/armv5te/TEMPLATE_CMPL_FLOAT.S
index b63780f..eb1c7e1 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_CMPL_FLOAT.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_CMPL_FLOAT.S
@@ -52,5 +52,3 @@
bxcc r11
$naninst @ r1<- 1 or -1 for NaN
bx r11
-
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_CMP_LONG.S b/vm/compiler/template/armv5te/TEMPLATE_CMP_LONG.S
index 5f1e16b..e5e8196 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_CMP_LONG.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_CMP_LONG.S
@@ -31,4 +31,3 @@
.L${opcode}_greater:
mov r0, #1 @ r0<- 1
bx lr
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S
index 61cdf45..a137d22 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_CHAIN.S
@@ -43,5 +43,3 @@
str rFP, [r2, #offThread_curFrame] @ self->curFrame = newFp
bx lr @ return to the callee-chaining cell
-
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
index d452a7f..2557863 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_INVOKE_METHOD_NATIVE.S
@@ -68,6 +68,3 @@
mov r0, #kCallsiteInterpreted
#endif
mov pc, r1
-
-
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S b/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S
index 8d01131..8e7f728 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_MONITOR_ENTER.S
@@ -23,4 +23,3 @@
mov r0, #kHeavyweightMonitor
#endif
bx r2
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_SHR_LONG.S b/vm/compiler/template/armv5te/TEMPLATE_SHR_LONG.S
index ca7545a..c737840 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_SHR_LONG.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_SHR_LONG.S
@@ -13,4 +13,3 @@
movpl r0, r1, asr ip @ if r2 >= 32, r0<-r1 >> (r2-32)
mov r1, r1, asr r2 @ r1<- r1 >> r2
bx lr
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_STRING_COMPARETO.S b/vm/compiler/template/armv5te/TEMPLATE_STRING_COMPARETO.S
index 75b6a90..54bde47 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_STRING_COMPARETO.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_STRING_COMPARETO.S
@@ -131,4 +131,3 @@
.Lmemcmp16:
.word __memcmp16
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_STRING_INDEXOF.S b/vm/compiler/template/armv5te/TEMPLATE_STRING_INDEXOF.S
index 84c4880..bdfdf28 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_STRING_INDEXOF.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_STRING_INDEXOF.S
@@ -110,4 +110,3 @@
sub r0, r7
asr r0, r0, #1
bx lr
-
diff --git a/vm/compiler/template/armv5te/TEMPLATE_USHR_LONG.S b/vm/compiler/template/armv5te/TEMPLATE_USHR_LONG.S
index d7c71d9..8a48df2 100644
--- a/vm/compiler/template/armv5te/TEMPLATE_USHR_LONG.S
+++ b/vm/compiler/template/armv5te/TEMPLATE_USHR_LONG.S
@@ -13,4 +13,3 @@
movpl r0, r1, lsr ip @ if r2 >= 32, r0<-r1 >>> (r2-32)
mov r1, r1, lsr r2 @ r1<- r1 >>> r2
bx lr
-
diff --git a/vm/compiler/template/armv5te/header.S b/vm/compiler/template/armv5te/header.S
index c257105..e6b3362 100644
--- a/vm/compiler/template/armv5te/header.S
+++ b/vm/compiler/template/armv5te/header.S
@@ -93,4 +93,3 @@
* to expand the macros into assembler assignment statements.
*/
#include "../../../mterp/common/asm-constants.h"
-
diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
index dc9a324..0823324 100644
--- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te-vfp.S
@@ -1552,4 +1552,3 @@
dmvCompilerTemplateEnd:
#endif /* WITH_JIT */
-
diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
index d632d6a..b9a3075 100644
--- a/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv5te.S
@@ -1280,4 +1280,3 @@
dmvCompilerTemplateEnd:
#endif /* WITH_JIT */
-
diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S
index 0719f07..008c324 100644
--- a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a-neon.S
@@ -1552,4 +1552,3 @@
dmvCompilerTemplateEnd:
#endif /* WITH_JIT */
-
diff --git a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
index 5c26ca2..5441057 100644
--- a/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
+++ b/vm/compiler/template/out/CompilerTemplateAsm-armv7-a.S
@@ -1552,4 +1552,3 @@
dmvCompilerTemplateEnd:
#endif /* WITH_JIT */
-
diff --git a/vm/compiler/template/rebuild.sh b/vm/compiler/template/rebuild.sh
index 78ff84f..8c47dd7 100755
--- a/vm/compiler/template/rebuild.sh
+++ b/vm/compiler/template/rebuild.sh
@@ -20,4 +20,3 @@
#
set -e
for arch in armv5te armv5te-vfp armv7-a armv7-a-neon; do TARGET_ARCH_EXT=$arch make -f Makefile-template; done
-
diff --git a/vm/hprof/Hprof.c b/vm/hprof/Hprof.c
index 8380fd8..0b95aad 100644
--- a/vm/hprof/Hprof.c
+++ b/vm/hprof/Hprof.c
@@ -224,4 +224,3 @@
free(ctx->fileDataPtr);
free(ctx);
}
-
diff --git a/vm/interp/README.txt b/vm/interp/README.txt
index 76d47a7..170d2b1 100644
--- a/vm/interp/README.txt
+++ b/vm/interp/README.txt
@@ -1,4 +1,3 @@
Dalvik interpreter entry point.
The "mterp" directory now holds the interpreter implementation.
-
diff --git a/vm/interp/Stack.c b/vm/interp/Stack.c
index f6a0620..673dc14 100644
--- a/vm/interp/Stack.c
+++ b/vm/interp/Stack.c
@@ -1380,4 +1380,3 @@
dumpFrames(target, stackCopy + fpOffset, thread);
free(stackCopy);
}
-
diff --git a/vm/jdwp/ExpandBuf.c b/vm/jdwp/ExpandBuf.c
index 50c3035..ade239c 100644
--- a/vm/jdwp/ExpandBuf.c
+++ b/vm/jdwp/ExpandBuf.c
@@ -173,4 +173,3 @@
setUtf8String(pBuf->storage + pBuf->curLen, str);
pBuf->curLen += sizeof(u4) + strLen;
}
-
diff --git a/vm/jdwp/JdwpAdb.c b/vm/jdwp/JdwpAdb.c
index ab13602..c3a1a72 100644
--- a/vm/jdwp/JdwpAdb.c
+++ b/vm/jdwp/JdwpAdb.c
@@ -759,4 +759,3 @@
{
return &socketTransport;
}
-
diff --git a/vm/jdwp/JdwpConstants.c b/vm/jdwp/JdwpConstants.c
index e089afa..898fe2c 100644
--- a/vm/jdwp/JdwpConstants.c
+++ b/vm/jdwp/JdwpConstants.c
@@ -237,4 +237,3 @@
default: return "?UNKNOWN?";
}
};
-
diff --git a/vm/jdwp/JdwpEvent.c b/vm/jdwp/JdwpEvent.c
index b1e2a40..69d2237 100644
--- a/vm/jdwp/JdwpEvent.c
+++ b/vm/jdwp/JdwpEvent.c
@@ -1290,4 +1290,3 @@
dvmJdwpSendBufferedRequest(state, wrapiov, iovcnt+1);
}
-
diff --git a/vm/jdwp/JdwpHandler.c b/vm/jdwp/JdwpHandler.c
index 06d76ed..978b56b 100644
--- a/vm/jdwp/JdwpHandler.c
+++ b/vm/jdwp/JdwpHandler.c
@@ -2203,4 +2203,3 @@
/* tell the VM that GC is okay again */
dvmDbgThreadWaiting();
}
-
diff --git a/vm/jdwp/JdwpMain.c b/vm/jdwp/JdwpMain.c
index 965a4b0..66d999c 100644
--- a/vm/jdwp/JdwpMain.c
+++ b/vm/jdwp/JdwpMain.c
@@ -439,4 +439,3 @@
//LOGI("+++ interval=%lld\n", now - last);
return now - last;
}
-
diff --git a/vm/jdwp/JdwpSocket.c b/vm/jdwp/JdwpSocket.c
index f5eebca..0c39202 100644
--- a/vm/jdwp/JdwpSocket.c
+++ b/vm/jdwp/JdwpSocket.c
@@ -922,4 +922,3 @@
{
return &socketTransport;
}
-
diff --git a/vm/jdwp/README.txt b/vm/jdwp/README.txt
index b511cc8..c97a069 100644
--- a/vm/jdwp/README.txt
+++ b/vm/jdwp/README.txt
@@ -10,4 +10,3 @@
might be useful in other projects. Once you get multiple simultaneous
events and debugger requests with thread suspension bouncing around,
though, it's difficult to keep things "generic".
-
diff --git a/vm/mterp/Makefile-mterp b/vm/mterp/Makefile-mterp
index d30dff2..2f96d59 100644
--- a/vm/mterp/Makefile-mterp
+++ b/vm/mterp/Makefile-mterp
@@ -49,4 +49,3 @@
$(GEN_SOURCES): $(SOURCE_DEPS)
@mkdir -p out
./gen-mterp.py $(TARGET_ARCH_EXT) $(OUTPUT_DIR)
-
diff --git a/vm/mterp/NOTES.txt b/vm/mterp/NOTES.txt
index e348934..5dc7caa 100644
--- a/vm/mterp/NOTES.txt
+++ b/vm/mterp/NOTES.txt
@@ -69,4 +69,3 @@
code. JNI handles returns from interp->native by adding the value to the
local references table, but returns from native->interp are simply stored
in the usual "retval".
-
diff --git a/vm/mterp/README.txt b/vm/mterp/README.txt
index e6141d2..80596ea 100644
--- a/vm/mterp/README.txt
+++ b/vm/mterp/README.txt
@@ -213,4 +213,3 @@
The ultimate goal is to have the build system generate the necessary
output files without requiring this separate step, but we're not yet
ready to require Python in the build.
-
diff --git a/vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S b/vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S
index a8c3ea4..b75216e 100644
--- a/vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S
+++ b/vm/mterp/arm-vfp/OP_CMPG_DOUBLE.S
@@ -40,4 +40,3 @@
.L${opcode}_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/arm-vfp/OP_CMPG_FLOAT.S b/vm/mterp/arm-vfp/OP_CMPG_FLOAT.S
index 4c14fbb..eade97d 100644
--- a/vm/mterp/arm-vfp/OP_CMPG_FLOAT.S
+++ b/vm/mterp/arm-vfp/OP_CMPG_FLOAT.S
@@ -40,4 +40,3 @@
.L${opcode}_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S b/vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S
index 999faee..6e85fe7 100644
--- a/vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S
+++ b/vm/mterp/arm-vfp/OP_CMPL_DOUBLE.S
@@ -40,4 +40,3 @@
.L${opcode}_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/arm-vfp/OP_CMPL_FLOAT.S b/vm/mterp/arm-vfp/OP_CMPL_FLOAT.S
index 9b2133c..bdeb0be 100644
--- a/vm/mterp/arm-vfp/OP_CMPL_FLOAT.S
+++ b/vm/mterp/arm-vfp/OP_CMPL_FLOAT.S
@@ -40,4 +40,3 @@
.L${opcode}_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_AGET_WIDE.S b/vm/mterp/armv4t/OP_AGET_WIDE.S
index f06cb8b..dc5eee8 100644
--- a/vm/mterp/armv4t/OP_AGET_WIDE.S
+++ b/vm/mterp/armv4t/OP_AGET_WIDE.S
@@ -31,4 +31,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_APUT_WIDE.S b/vm/mterp/armv4t/OP_APUT_WIDE.S
index e8db664..9a718f2 100644
--- a/vm/mterp/armv4t/OP_APUT_WIDE.S
+++ b/vm/mterp/armv4t/OP_APUT_WIDE.S
@@ -29,4 +29,3 @@
add r0, #offArrayObject_contents
stmia r0, {r2-r3} @ vBB[vCC] <- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_IGET_WIDE.S b/vm/mterp/armv4t/OP_IGET_WIDE.S
index dabaeba..a725ca3 100644
--- a/vm/mterp/armv4t/OP_IGET_WIDE.S
+++ b/vm/mterp/armv4t/OP_IGET_WIDE.S
@@ -48,4 +48,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_IGET_WIDE_QUICK.S b/vm/mterp/armv4t/OP_IGET_WIDE_QUICK.S
index 36a6e1d..b0022f5 100644
--- a/vm/mterp/armv4t/OP_IGET_WIDE_QUICK.S
+++ b/vm/mterp/armv4t/OP_IGET_WIDE_QUICK.S
@@ -15,4 +15,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_IPUT_WIDE.S b/vm/mterp/armv4t/OP_IPUT_WIDE.S
index d824d9d..482a0b2 100644
--- a/vm/mterp/armv4t/OP_IPUT_WIDE.S
+++ b/vm/mterp/armv4t/OP_IPUT_WIDE.S
@@ -44,4 +44,3 @@
stmia r2, {r0-r1} @ obj.field (64 bits, aligned)<- r0/r1
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_IPUT_WIDE_QUICK.S b/vm/mterp/armv4t/OP_IPUT_WIDE_QUICK.S
index a483060..b062127 100644
--- a/vm/mterp/armv4t/OP_IPUT_WIDE_QUICK.S
+++ b/vm/mterp/armv4t/OP_IPUT_WIDE_QUICK.S
@@ -15,4 +15,3 @@
stmia r2, {r0-r1} @ obj.field (64 bits, aligned)<- r0/r1
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv4t/OP_SGET_WIDE.S b/vm/mterp/armv4t/OP_SGET_WIDE.S
index 2556a7c..102b577 100644
--- a/vm/mterp/armv4t/OP_SGET_WIDE.S
+++ b/vm/mterp/armv4t/OP_SGET_WIDE.S
@@ -42,4 +42,3 @@
cmp r0, #0 @ success?
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv4t/OP_SPUT_WIDE.S b/vm/mterp/armv4t/OP_SPUT_WIDE.S
index 237233c..8f92ed6 100644
--- a/vm/mterp/armv4t/OP_SPUT_WIDE.S
+++ b/vm/mterp/armv4t/OP_SPUT_WIDE.S
@@ -44,4 +44,3 @@
mov r2, r0 @ copy to r2
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv4t/platform.S b/vm/mterp/armv4t/platform.S
index d7a6d71..bb2854a 100644
--- a/vm/mterp/armv4t/platform.S
+++ b/vm/mterp/armv4t/platform.S
@@ -36,4 +36,3 @@
ldmfd sp!, {\regs,lr}
bx lr
.endm
-
diff --git a/vm/mterp/armv5te/OP_AGET.S b/vm/mterp/armv5te/OP_AGET.S
index 7a0950b..8d8ed58 100644
--- a/vm/mterp/armv5te/OP_AGET.S
+++ b/vm/mterp/armv5te/OP_AGET.S
@@ -25,4 +25,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_AGET_WIDE.S b/vm/mterp/armv5te/OP_AGET_WIDE.S
index ec346ca..6f641dc 100644
--- a/vm/mterp/armv5te/OP_AGET_WIDE.S
+++ b/vm/mterp/armv5te/OP_AGET_WIDE.S
@@ -30,4 +30,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_APUT.S b/vm/mterp/armv5te/OP_APUT.S
index f8ee4a8..741aadd 100644
--- a/vm/mterp/armv5te/OP_APUT.S
+++ b/vm/mterp/armv5te/OP_APUT.S
@@ -25,4 +25,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
$store r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_APUT_OBJECT.S b/vm/mterp/armv5te/OP_APUT_OBJECT.S
index c99ac2e..03477f5 100644
--- a/vm/mterp/armv5te/OP_APUT_OBJECT.S
+++ b/vm/mterp/armv5te/OP_APUT_OBJECT.S
@@ -41,4 +41,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_APUT_WIDE.S b/vm/mterp/armv5te/OP_APUT_WIDE.S
index 48738cc..cc9f332 100644
--- a/vm/mterp/armv5te/OP_APUT_WIDE.S
+++ b/vm/mterp/armv5te/OP_APUT_WIDE.S
@@ -30,4 +30,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
strd r2, [r0, #offArrayObject_contents] @ r2/r3<- vBB[vCC]
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_ARRAY_LENGTH.S b/vm/mterp/armv5te/OP_ARRAY_LENGTH.S
index 5dc0f93..3a6faf3 100644
--- a/vm/mterp/armv5te/OP_ARRAY_LENGTH.S
+++ b/vm/mterp/armv5te/OP_ARRAY_LENGTH.S
@@ -13,4 +13,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CHECK_CAST.S b/vm/mterp/armv5te/OP_CHECK_CAST.S
index 74f458b..c711276 100644
--- a/vm/mterp/armv5te/OP_CHECK_CAST.S
+++ b/vm/mterp/armv5te/OP_CHECK_CAST.S
@@ -70,4 +70,3 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
diff --git a/vm/mterp/armv5te/OP_CMPL_DOUBLE.S b/vm/mterp/armv5te/OP_CMPL_DOUBLE.S
index 50ff3f7..01a63f7 100644
--- a/vm/mterp/armv5te/OP_CMPL_DOUBLE.S
+++ b/vm/mterp/armv5te/OP_CMPL_DOUBLE.S
@@ -46,4 +46,3 @@
bcc .L${opcode}_finish
$naninst @ r1<- 1 or -1 for NaN
b .L${opcode}_finish
-
diff --git a/vm/mterp/armv5te/OP_CMPL_FLOAT.S b/vm/mterp/armv5te/OP_CMPL_FLOAT.S
index c53d419..657f0dc 100644
--- a/vm/mterp/armv5te/OP_CMPL_FLOAT.S
+++ b/vm/mterp/armv5te/OP_CMPL_FLOAT.S
@@ -113,4 +113,3 @@
b ${opcode}_finish
#endif
-
diff --git a/vm/mterp/armv5te/OP_CMP_LONG.S b/vm/mterp/armv5te/OP_CMP_LONG.S
index d456137..084a3f2 100644
--- a/vm/mterp/armv5te/OP_CMP_LONG.S
+++ b/vm/mterp/armv5te/OP_CMP_LONG.S
@@ -58,4 +58,3 @@
SET_VREG(r1, r9) @ vAA<- r1
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST.S b/vm/mterp/armv5te/OP_CONST.S
index 4394647..a813c52 100644
--- a/vm/mterp/armv5te/OP_CONST.S
+++ b/vm/mterp/armv5te/OP_CONST.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_16.S b/vm/mterp/armv5te/OP_CONST_16.S
index 0b44c99..b5654a3 100644
--- a/vm/mterp/armv5te/OP_CONST_16.S
+++ b/vm/mterp/armv5te/OP_CONST_16.S
@@ -6,4 +6,3 @@
SET_VREG(r0, r3) @ vAA<- r0
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_4.S b/vm/mterp/armv5te/OP_CONST_4.S
index 9ac53c2..6dd53af 100644
--- a/vm/mterp/armv5te/OP_CONST_4.S
+++ b/vm/mterp/armv5te/OP_CONST_4.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ ip<- opcode from rINST
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_CLASS.S b/vm/mterp/armv5te/OP_CONST_CLASS.S
index b834553..665e582 100644
--- a/vm/mterp/armv5te/OP_CONST_CLASS.S
+++ b/vm/mterp/armv5te/OP_CONST_CLASS.S
@@ -33,4 +33,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_HIGH16.S b/vm/mterp/armv5te/OP_CONST_HIGH16.S
index 07b5061..4536d3a 100644
--- a/vm/mterp/armv5te/OP_CONST_HIGH16.S
+++ b/vm/mterp/armv5te/OP_CONST_HIGH16.S
@@ -7,4 +7,3 @@
SET_VREG(r0, r3) @ vAA<- r0
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_STRING.S b/vm/mterp/armv5te/OP_CONST_STRING.S
index 5e2e389..2df3fda 100644
--- a/vm/mterp/armv5te/OP_CONST_STRING.S
+++ b/vm/mterp/armv5te/OP_CONST_STRING.S
@@ -32,4 +32,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_STRING_JUMBO.S b/vm/mterp/armv5te/OP_CONST_STRING_JUMBO.S
index b98e0e1..cf9b009 100644
--- a/vm/mterp/armv5te/OP_CONST_STRING_JUMBO.S
+++ b/vm/mterp/armv5te/OP_CONST_STRING_JUMBO.S
@@ -34,4 +34,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_WIDE.S b/vm/mterp/armv5te/OP_CONST_WIDE.S
index 428d423..b724264 100644
--- a/vm/mterp/armv5te/OP_CONST_WIDE.S
+++ b/vm/mterp/armv5te/OP_CONST_WIDE.S
@@ -12,4 +12,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_WIDE_16.S b/vm/mterp/armv5te/OP_CONST_WIDE_16.S
index 2d37d58..e3e4149 100644
--- a/vm/mterp/armv5te/OP_CONST_WIDE_16.S
+++ b/vm/mterp/armv5te/OP_CONST_WIDE_16.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_WIDE_32.S b/vm/mterp/armv5te/OP_CONST_WIDE_32.S
index 5991eb4..a86e042 100644
--- a/vm/mterp/armv5te/OP_CONST_WIDE_32.S
+++ b/vm/mterp/armv5te/OP_CONST_WIDE_32.S
@@ -10,4 +10,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_CONST_WIDE_HIGH16.S b/vm/mterp/armv5te/OP_CONST_WIDE_HIGH16.S
index 2e23f79..11bf518 100644
--- a/vm/mterp/armv5te/OP_CONST_WIDE_HIGH16.S
+++ b/vm/mterp/armv5te/OP_CONST_WIDE_HIGH16.S
@@ -9,4 +9,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_DOUBLE_TO_INT.S b/vm/mterp/armv5te/OP_DOUBLE_TO_INT.S
index 2cf88f0..3e0a26b 100644
--- a/vm/mterp/armv5te/OP_DOUBLE_TO_INT.S
+++ b/vm/mterp/armv5te/OP_DOUBLE_TO_INT.S
@@ -52,4 +52,3 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
#endif
-
diff --git a/vm/mterp/armv5te/OP_DOUBLE_TO_LONG.S b/vm/mterp/armv5te/OP_DOUBLE_TO_LONG.S
index 563027d..ff0fd2e 100644
--- a/vm/mterp/armv5te/OP_DOUBLE_TO_LONG.S
+++ b/vm/mterp/armv5te/OP_DOUBLE_TO_LONG.S
@@ -51,4 +51,3 @@
1:
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
diff --git a/vm/mterp/armv5te/OP_EXECUTE_INLINE.S b/vm/mterp/armv5te/OP_EXECUTE_INLINE.S
index 550bb83..f7ca704 100644
--- a/vm/mterp/armv5te/OP_EXECUTE_INLINE.S
+++ b/vm/mterp/armv5te/OP_EXECUTE_INLINE.S
@@ -58,4 +58,3 @@
.L${opcode}_table:
.word gDvmInlineOpsTable
-
diff --git a/vm/mterp/armv5te/OP_EXECUTE_INLINE_RANGE.S b/vm/mterp/armv5te/OP_EXECUTE_INLINE_RANGE.S
index 4d62019..cf8b151 100644
--- a/vm/mterp/armv5te/OP_EXECUTE_INLINE_RANGE.S
+++ b/vm/mterp/armv5te/OP_EXECUTE_INLINE_RANGE.S
@@ -53,4 +53,3 @@
.L${opcode}_table:
.word gDvmInlineOpsTable
-
diff --git a/vm/mterp/armv5te/OP_FILLED_NEW_ARRAY.S b/vm/mterp/armv5te/OP_FILLED_NEW_ARRAY.S
index a9c2d3e..1241c13 100644
--- a/vm/mterp/armv5te/OP_FILLED_NEW_ARRAY.S
+++ b/vm/mterp/armv5te/OP_FILLED_NEW_ARRAY.S
@@ -100,4 +100,3 @@
.L_strInternalError:
.word .LstrInternalError
.endif
-
diff --git a/vm/mterp/armv5te/OP_FLOAT_TO_INT.S b/vm/mterp/armv5te/OP_FLOAT_TO_INT.S
index e5f0ef5..c9cb957 100644
--- a/vm/mterp/armv5te/OP_FLOAT_TO_INT.S
+++ b/vm/mterp/armv5te/OP_FLOAT_TO_INT.S
@@ -38,4 +38,3 @@
bl __aeabi_f2iz @ convert float to int
ldmfd sp!, {r4, pc}
#endif
-
diff --git a/vm/mterp/armv5te/OP_FLOAT_TO_LONG.S b/vm/mterp/armv5te/OP_FLOAT_TO_LONG.S
index 19f7b96..e42e1a4 100644
--- a/vm/mterp/armv5te/OP_FLOAT_TO_LONG.S
+++ b/vm/mterp/armv5te/OP_FLOAT_TO_LONG.S
@@ -38,4 +38,3 @@
mov r0, r4 @ recover arg
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
diff --git a/vm/mterp/armv5te/OP_GOTO_16.S b/vm/mterp/armv5te/OP_GOTO_16.S
index f738a98..5a8edee 100644
--- a/vm/mterp/armv5te/OP_GOTO_16.S
+++ b/vm/mterp/armv5te/OP_GOTO_16.S
@@ -22,4 +22,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
diff --git a/vm/mterp/armv5te/OP_IGET.S b/vm/mterp/armv5te/OP_IGET.S
index a347e5c..f463d3f 100644
--- a/vm/mterp/armv5te/OP_IGET.S
+++ b/vm/mterp/armv5te/OP_IGET.S
@@ -44,4 +44,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IGET_QUICK.S b/vm/mterp/armv5te/OP_IGET_QUICK.S
index f248bc2..c19f870 100644
--- a/vm/mterp/armv5te/OP_IGET_QUICK.S
+++ b/vm/mterp/armv5te/OP_IGET_QUICK.S
@@ -14,4 +14,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IGET_WIDE.S b/vm/mterp/armv5te/OP_IGET_WIDE.S
index 6d3eb45..1188361 100644
--- a/vm/mterp/armv5te/OP_IGET_WIDE.S
+++ b/vm/mterp/armv5te/OP_IGET_WIDE.S
@@ -47,4 +47,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IGET_WIDE_QUICK.S b/vm/mterp/armv5te/OP_IGET_WIDE_QUICK.S
index 189b683..b32e429 100644
--- a/vm/mterp/armv5te/OP_IGET_WIDE_QUICK.S
+++ b/vm/mterp/armv5te/OP_IGET_WIDE_QUICK.S
@@ -14,4 +14,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_INSTANCE_OF.S b/vm/mterp/armv5te/OP_INSTANCE_OF.S
index da9f450..66f0df3 100644
--- a/vm/mterp/armv5te/OP_INSTANCE_OF.S
+++ b/vm/mterp/armv5te/OP_INSTANCE_OF.S
@@ -83,4 +83,3 @@
GET_VREG(r0, r3) @ r0<- vB (object)
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .L${opcode}_resolved @ pick up where we left off
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_DIRECT.S b/vm/mterp/armv5te/OP_INVOKE_DIRECT.S
index c8d551c..14ba8f7 100644
--- a/vm/mterp/armv5te/OP_INVOKE_DIRECT.S
+++ b/vm/mterp/armv5te/OP_INVOKE_DIRECT.S
@@ -45,4 +45,3 @@
GET_VREG(r2, r10) @ r2<- "this" ptr (reload)
bne .L${opcode}_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_INTERFACE.S b/vm/mterp/armv5te/OP_INVOKE_INTERFACE.S
index 91b6a7e..7d52454 100644
--- a/vm/mterp/armv5te/OP_INVOKE_INTERFACE.S
+++ b/vm/mterp/armv5te/OP_INVOKE_INTERFACE.S
@@ -25,4 +25,3 @@
cmp r0, #0 @ failed?
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethod${routine} @ jump to common handler
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_STATIC.S b/vm/mterp/armv5te/OP_INVOKE_STATIC.S
index 57d337b..cb359e6 100644
--- a/vm/mterp/armv5te/OP_INVOKE_STATIC.S
+++ b/vm/mterp/armv5te/OP_INVOKE_STATIC.S
@@ -22,4 +22,3 @@
cmp r0, #0 @ got null?
bne common_invokeMethod${routine} @ no, continue
b common_exceptionThrown @ yes, handle exception
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_SUPER.S b/vm/mterp/armv5te/OP_INVOKE_SUPER.S
index f24f690..6117947 100644
--- a/vm/mterp/armv5te/OP_INVOKE_SUPER.S
+++ b/vm/mterp/armv5te/OP_INVOKE_SUPER.S
@@ -58,4 +58,3 @@
.L${opcode}_nsm:
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_SUPER_QUICK.S b/vm/mterp/armv5te/OP_INVOKE_SUPER_QUICK.S
index 90b2a91..bd07d06 100644
--- a/vm/mterp/armv5te/OP_INVOKE_SUPER_QUICK.S
+++ b/vm/mterp/armv5te/OP_INVOKE_SUPER_QUICK.S
@@ -23,4 +23,3 @@
ldr r0, [r2, r1, lsl #2] @ r0<- super->vtable[BBBB]
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethod${routine} @ continue on
-
diff --git a/vm/mterp/armv5te/OP_INVOKE_VIRTUAL.S b/vm/mterp/armv5te/OP_INVOKE_VIRTUAL.S
index 33dc108..d92c6a9 100644
--- a/vm/mterp/armv5te/OP_INVOKE_VIRTUAL.S
+++ b/vm/mterp/armv5te/OP_INVOKE_VIRTUAL.S
@@ -43,4 +43,3 @@
ldr r3, [r3, #offClassObject_vtable] @ r3<- thisPtr->clazz->vtable
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethod${routine} @ continue on
-
diff --git a/vm/mterp/armv5te/OP_IPUT.S b/vm/mterp/armv5te/OP_IPUT.S
index 35c139f..cbc5e31 100644
--- a/vm/mterp/armv5te/OP_IPUT.S
+++ b/vm/mterp/armv5te/OP_IPUT.S
@@ -44,4 +44,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
$store r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IPUT_QUICK.S b/vm/mterp/armv5te/OP_IPUT_QUICK.S
index c33a738..c15da2b 100644
--- a/vm/mterp/armv5te/OP_IPUT_QUICK.S
+++ b/vm/mterp/armv5te/OP_IPUT_QUICK.S
@@ -14,4 +14,3 @@
str r0, [r3, r1] @ obj.field (always 32 bits)<- r0
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IPUT_WIDE.S b/vm/mterp/armv5te/OP_IPUT_WIDE.S
index 763c6a8..64186ca 100644
--- a/vm/mterp/armv5te/OP_IPUT_WIDE.S
+++ b/vm/mterp/armv5te/OP_IPUT_WIDE.S
@@ -44,4 +44,3 @@
strd r0, [r9, r3] @ obj.field (64 bits, aligned)<- r0/r1
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_IPUT_WIDE_QUICK.S b/vm/mterp/armv5te/OP_IPUT_WIDE_QUICK.S
index 290591c..b7dd703 100644
--- a/vm/mterp/armv5te/OP_IPUT_WIDE_QUICK.S
+++ b/vm/mterp/armv5te/OP_IPUT_WIDE_QUICK.S
@@ -14,4 +14,3 @@
strd r0, [r2, r3] @ obj.field (64 bits, aligned)<- r0/r1
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MONITOR_ENTER.S b/vm/mterp/armv5te/OP_MONITOR_ENTER.S
index 524621a..36faabc 100644
--- a/vm/mterp/armv5te/OP_MONITOR_ENTER.S
+++ b/vm/mterp/armv5te/OP_MONITOR_ENTER.S
@@ -20,4 +20,3 @@
#endif
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MONITOR_EXIT.S b/vm/mterp/armv5te/OP_MONITOR_EXIT.S
index c9aedf0..5c1b3c7 100644
--- a/vm/mterp/armv5te/OP_MONITOR_EXIT.S
+++ b/vm/mterp/armv5te/OP_MONITOR_EXIT.S
@@ -24,4 +24,3 @@
1:
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
diff --git a/vm/mterp/armv5te/OP_MOVE.S b/vm/mterp/armv5te/OP_MOVE.S
index 48db45f..efeddf4 100644
--- a/vm/mterp/armv5te/OP_MOVE.S
+++ b/vm/mterp/armv5te/OP_MOVE.S
@@ -9,4 +9,3 @@
GET_INST_OPCODE(ip) @ ip<- opcode from rINST
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_16.S b/vm/mterp/armv5te/OP_MOVE_16.S
index f20f57b..3c08759 100644
--- a/vm/mterp/armv5te/OP_MOVE_16.S
+++ b/vm/mterp/armv5te/OP_MOVE_16.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_EXCEPTION.S b/vm/mterp/armv5te/OP_MOVE_EXCEPTION.S
index 45e66fa..f9e4cff 100644
--- a/vm/mterp/armv5te/OP_MOVE_EXCEPTION.S
+++ b/vm/mterp/armv5te/OP_MOVE_EXCEPTION.S
@@ -9,4 +9,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_FROM16.S b/vm/mterp/armv5te/OP_MOVE_FROM16.S
index fe54374..fdcc64e 100644
--- a/vm/mterp/armv5te/OP_MOVE_FROM16.S
+++ b/vm/mterp/armv5te/OP_MOVE_FROM16.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_RESULT.S b/vm/mterp/armv5te/OP_MOVE_RESULT.S
index d19de23..9de8401 100644
--- a/vm/mterp/armv5te/OP_MOVE_RESULT.S
+++ b/vm/mterp/armv5te/OP_MOVE_RESULT.S
@@ -7,4 +7,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_RESULT_WIDE.S b/vm/mterp/armv5te/OP_MOVE_RESULT_WIDE.S
index 7bb8254..92f7443 100644
--- a/vm/mterp/armv5te/OP_MOVE_RESULT_WIDE.S
+++ b/vm/mterp/armv5te/OP_MOVE_RESULT_WIDE.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_WIDE.S b/vm/mterp/armv5te/OP_MOVE_WIDE.S
index 6bcc89a..05151e1 100644
--- a/vm/mterp/armv5te/OP_MOVE_WIDE.S
+++ b/vm/mterp/armv5te/OP_MOVE_WIDE.S
@@ -11,4 +11,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_WIDE_16.S b/vm/mterp/armv5te/OP_MOVE_WIDE_16.S
index 88d996f..172ef03 100644
--- a/vm/mterp/armv5te/OP_MOVE_WIDE_16.S
+++ b/vm/mterp/armv5te/OP_MOVE_WIDE_16.S
@@ -10,4 +10,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MOVE_WIDE_FROM16.S b/vm/mterp/armv5te/OP_MOVE_WIDE_FROM16.S
index 0771dbc..81ae7dc 100644
--- a/vm/mterp/armv5te/OP_MOVE_WIDE_FROM16.S
+++ b/vm/mterp/armv5te/OP_MOVE_WIDE_FROM16.S
@@ -10,4 +10,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MUL_LONG.S b/vm/mterp/armv5te/OP_MUL_LONG.S
index b812ca1..3a7aac1 100644
--- a/vm/mterp/armv5te/OP_MUL_LONG.S
+++ b/vm/mterp/armv5te/OP_MUL_LONG.S
@@ -39,4 +39,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_MUL_LONG_2ADDR.S b/vm/mterp/armv5te/OP_MUL_LONG_2ADDR.S
index 4c1bcb8..a561dc9 100644
--- a/vm/mterp/armv5te/OP_MUL_LONG_2ADDR.S
+++ b/vm/mterp/armv5te/OP_MUL_LONG_2ADDR.S
@@ -24,4 +24,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_NEW_ARRAY.S b/vm/mterp/armv5te/OP_NEW_ARRAY.S
index 55fc4f3..da93c45 100644
--- a/vm/mterp/armv5te/OP_NEW_ARRAY.S
+++ b/vm/mterp/armv5te/OP_NEW_ARRAY.S
@@ -59,4 +59,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_NEW_INSTANCE.S b/vm/mterp/armv5te/OP_NEW_INSTANCE.S
index 639d9c6..2687e55 100644
--- a/vm/mterp/armv5te/OP_NEW_INSTANCE.S
+++ b/vm/mterp/armv5te/OP_NEW_INSTANCE.S
@@ -66,4 +66,3 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
diff --git a/vm/mterp/armv5te/OP_NOP.S b/vm/mterp/armv5te/OP_NOP.S
index 1b72d3c..ff4cf5a 100644
--- a/vm/mterp/armv5te/OP_NOP.S
+++ b/vm/mterp/armv5te/OP_NOP.S
@@ -12,4 +12,3 @@
MTERP_ENTRY2
.fnend
#endif
-
diff --git a/vm/mterp/armv5te/OP_PACKED_SWITCH.S b/vm/mterp/armv5te/OP_PACKED_SWITCH.S
index 72e742a..941b232 100644
--- a/vm/mterp/armv5te/OP_PACKED_SWITCH.S
+++ b/vm/mterp/armv5te/OP_PACKED_SWITCH.S
@@ -32,4 +32,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
diff --git a/vm/mterp/armv5te/OP_RETURN.S b/vm/mterp/armv5te/OP_RETURN.S
index f76a223..8838182 100644
--- a/vm/mterp/armv5te/OP_RETURN.S
+++ b/vm/mterp/armv5te/OP_RETURN.S
@@ -10,4 +10,3 @@
GET_VREG(r0, r2) @ r0<- vAA
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
diff --git a/vm/mterp/armv5te/OP_RETURN_VOID.S b/vm/mterp/armv5te/OP_RETURN_VOID.S
index 647002d..e09ebb0 100644
--- a/vm/mterp/armv5te/OP_RETURN_VOID.S
+++ b/vm/mterp/armv5te/OP_RETURN_VOID.S
@@ -1,3 +1,2 @@
%verify "executed"
b common_returnFromMethod
-
diff --git a/vm/mterp/armv5te/OP_RETURN_WIDE.S b/vm/mterp/armv5te/OP_RETURN_WIDE.S
index 2d30792..33880de 100644
--- a/vm/mterp/armv5te/OP_RETURN_WIDE.S
+++ b/vm/mterp/armv5te/OP_RETURN_WIDE.S
@@ -10,4 +10,3 @@
ldmia r2, {r0-r1} @ r0/r1 <- vAA/vAA+1
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
diff --git a/vm/mterp/armv5te/OP_SGET.S b/vm/mterp/armv5te/OP_SGET.S
index 17ab26a..b713836 100644
--- a/vm/mterp/armv5te/OP_SGET.S
+++ b/vm/mterp/armv5te/OP_SGET.S
@@ -35,4 +35,3 @@
cmp r0, #0 @ success?
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv5te/OP_SGET_WIDE.S b/vm/mterp/armv5te/OP_SGET_WIDE.S
index ff0238c..908bced 100644
--- a/vm/mterp/armv5te/OP_SGET_WIDE.S
+++ b/vm/mterp/armv5te/OP_SGET_WIDE.S
@@ -42,4 +42,3 @@
cmp r0, #0 @ success?
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv5te/OP_SHL_LONG.S b/vm/mterp/armv5te/OP_SHL_LONG.S
index 3510565..b48ca5e 100644
--- a/vm/mterp/armv5te/OP_SHL_LONG.S
+++ b/vm/mterp/armv5te/OP_SHL_LONG.S
@@ -30,4 +30,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_SHL_LONG_2ADDR.S b/vm/mterp/armv5te/OP_SHL_LONG_2ADDR.S
index 93f8260..42a0904 100644
--- a/vm/mterp/armv5te/OP_SHL_LONG_2ADDR.S
+++ b/vm/mterp/armv5te/OP_SHL_LONG_2ADDR.S
@@ -26,4 +26,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_SHR_LONG.S b/vm/mterp/armv5te/OP_SHR_LONG.S
index c7f10aa..e6489a0 100644
--- a/vm/mterp/armv5te/OP_SHR_LONG.S
+++ b/vm/mterp/armv5te/OP_SHR_LONG.S
@@ -30,4 +30,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_SHR_LONG_2ADDR.S b/vm/mterp/armv5te/OP_SHR_LONG_2ADDR.S
index 188017f..9414ffb 100644
--- a/vm/mterp/armv5te/OP_SHR_LONG_2ADDR.S
+++ b/vm/mterp/armv5te/OP_SHR_LONG_2ADDR.S
@@ -26,4 +26,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_SPUT.S b/vm/mterp/armv5te/OP_SPUT.S
index 5236614..2dd542a 100644
--- a/vm/mterp/armv5te/OP_SPUT.S
+++ b/vm/mterp/armv5te/OP_SPUT.S
@@ -35,4 +35,3 @@
cmp r0, #0 @ success?
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv5te/OP_SPUT_WIDE.S b/vm/mterp/armv5te/OP_SPUT_WIDE.S
index 69b106c..646b9c9 100644
--- a/vm/mterp/armv5te/OP_SPUT_WIDE.S
+++ b/vm/mterp/armv5te/OP_SPUT_WIDE.S
@@ -44,4 +44,3 @@
mov r2, r0 @ copy to r2
bne .L${opcode}_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
diff --git a/vm/mterp/armv5te/OP_THROW.S b/vm/mterp/armv5te/OP_THROW.S
index b034243..dd0a0b8 100644
--- a/vm/mterp/armv5te/OP_THROW.S
+++ b/vm/mterp/armv5te/OP_THROW.S
@@ -13,4 +13,3 @@
@ bypass dvmSetException, just store it
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
diff --git a/vm/mterp/armv5te/OP_THROW_VERIFICATION_ERROR.S b/vm/mterp/armv5te/OP_THROW_VERIFICATION_ERROR.S
index 0ed928b..8bd4f35 100644
--- a/vm/mterp/armv5te/OP_THROW_VERIFICATION_ERROR.S
+++ b/vm/mterp/armv5te/OP_THROW_VERIFICATION_ERROR.S
@@ -11,4 +11,3 @@
mov r1, rINST, lsr #8 @ r1<- AA
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
diff --git a/vm/mterp/armv5te/OP_USHR_LONG.S b/vm/mterp/armv5te/OP_USHR_LONG.S
index fc14b57..d9ae338 100644
--- a/vm/mterp/armv5te/OP_USHR_LONG.S
+++ b/vm/mterp/armv5te/OP_USHR_LONG.S
@@ -30,4 +30,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/OP_USHR_LONG_2ADDR.S b/vm/mterp/armv5te/OP_USHR_LONG_2ADDR.S
index 18167e3..27592a4 100644
--- a/vm/mterp/armv5te/OP_USHR_LONG_2ADDR.S
+++ b/vm/mterp/armv5te/OP_USHR_LONG_2ADDR.S
@@ -26,4 +26,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv5te/bincmp.S b/vm/mterp/armv5te/bincmp.S
index 1f43918..58f9079 100644
--- a/vm/mterp/armv5te/bincmp.S
+++ b/vm/mterp/armv5te/bincmp.S
@@ -29,4 +29,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
diff --git a/vm/mterp/armv5te/binop.S b/vm/mterp/armv5te/binop.S
index 0f085dc..d169ed6 100644
--- a/vm/mterp/armv5te/binop.S
+++ b/vm/mterp/armv5te/binop.S
@@ -33,4 +33,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 11-14 instructions */
-
diff --git a/vm/mterp/armv5te/binop2addr.S b/vm/mterp/armv5te/binop2addr.S
index 27afdda..061242a 100644
--- a/vm/mterp/armv5te/binop2addr.S
+++ b/vm/mterp/armv5te/binop2addr.S
@@ -31,4 +31,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-13 instructions */
-
diff --git a/vm/mterp/armv5te/binopLit16.S b/vm/mterp/armv5te/binopLit16.S
index 3cb1875..df49929 100644
--- a/vm/mterp/armv5te/binopLit16.S
+++ b/vm/mterp/armv5te/binopLit16.S
@@ -28,4 +28,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-13 instructions */
-
diff --git a/vm/mterp/armv5te/binopLit8.S b/vm/mterp/armv5te/binopLit8.S
index 4406259..2addd26 100644
--- a/vm/mterp/armv5te/binopLit8.S
+++ b/vm/mterp/armv5te/binopLit8.S
@@ -30,4 +30,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-12 instructions */
-
diff --git a/vm/mterp/armv5te/binopWide.S b/vm/mterp/armv5te/binopWide.S
index 87c5f07..71fd3fe 100644
--- a/vm/mterp/armv5te/binopWide.S
+++ b/vm/mterp/armv5te/binopWide.S
@@ -36,4 +36,3 @@
stmia r9, {$result0,$result1} @ vAA/vAA+1<- $result0/$result1
GOTO_OPCODE(ip) @ jump to next instruction
/* 14-17 instructions */
-
diff --git a/vm/mterp/armv5te/binopWide2addr.S b/vm/mterp/armv5te/binopWide2addr.S
index 98c6c98..3fd5747 100644
--- a/vm/mterp/armv5te/binopWide2addr.S
+++ b/vm/mterp/armv5te/binopWide2addr.S
@@ -33,4 +33,3 @@
stmia r9, {$result0,$result1} @ vAA/vAA+1<- $result0/$result1
GOTO_OPCODE(ip) @ jump to next instruction
/* 12-15 instructions */
-
diff --git a/vm/mterp/armv5te/entry.S b/vm/mterp/armv5te/entry.S
index 99e2366..881c0e0 100644
--- a/vm/mterp/armv5te/entry.S
+++ b/vm/mterp/armv5te/entry.S
@@ -148,4 +148,3 @@
*/
strBadEntryPoint:
.word .LstrBadEntryPoint
-
diff --git a/vm/mterp/armv5te/footer.S b/vm/mterp/armv5te/footer.S
index 6ef115b..72eb5ce 100644
--- a/vm/mterp/armv5te/footer.S
+++ b/vm/mterp/armv5te/footer.S
@@ -1223,4 +1223,3 @@
.asciz "<0x%x>"
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/armv5te/platform.S b/vm/mterp/armv5te/platform.S
index 4e7c03e..fd85338 100644
--- a/vm/mterp/armv5te/platform.S
+++ b/vm/mterp/armv5te/platform.S
@@ -33,4 +33,3 @@
.macro LDMFD_PC regs
ldmfd sp!, {\regs,pc}
.endm
-
diff --git a/vm/mterp/armv5te/stub.S b/vm/mterp/armv5te/stub.S
index 7607f09..54f0778 100644
--- a/vm/mterp/armv5te/stub.S
+++ b/vm/mterp/armv5te/stub.S
@@ -6,4 +6,3 @@
FETCH_INST() @ load next instruction from rPC
GET_INST_OPCODE(ip) @ ...trim down to just the opcode
GOTO_OPCODE(ip) @ ...and jump to the handler
-
diff --git a/vm/mterp/armv5te/unopWide.S b/vm/mterp/armv5te/unopWide.S
index e097317..0805fdf 100644
--- a/vm/mterp/armv5te/unopWide.S
+++ b/vm/mterp/armv5te/unopWide.S
@@ -20,4 +20,3 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
/* 12-13 instructions */
-
diff --git a/vm/mterp/armv5te/unused.S b/vm/mterp/armv5te/unused.S
index 1c82919..0194f58 100644
--- a/vm/mterp/armv5te/unused.S
+++ b/vm/mterp/armv5te/unused.S
@@ -1,2 +1 @@
bl common_abort
-
diff --git a/vm/mterp/armv5te/zcmp.S b/vm/mterp/armv5te/zcmp.S
index 861ca5b..d79e7c4 100644
--- a/vm/mterp/armv5te/zcmp.S
+++ b/vm/mterp/armv5te/zcmp.S
@@ -29,4 +29,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
diff --git a/vm/mterp/armv6t2/OP_ARRAY_LENGTH.S b/vm/mterp/armv6t2/OP_ARRAY_LENGTH.S
index bb995e2..05991be 100644
--- a/vm/mterp/armv6t2/OP_ARRAY_LENGTH.S
+++ b/vm/mterp/armv6t2/OP_ARRAY_LENGTH.S
@@ -12,4 +12,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_CONST_4.S b/vm/mterp/armv6t2/OP_CONST_4.S
index 0d6092c..8ec67d7 100644
--- a/vm/mterp/armv6t2/OP_CONST_4.S
+++ b/vm/mterp/armv6t2/OP_CONST_4.S
@@ -7,4 +7,3 @@
GET_INST_OPCODE(ip) @ ip<- opcode from rINST
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
diff --git a/vm/mterp/armv6t2/OP_DOUBLE_TO_INT.S b/vm/mterp/armv6t2/OP_DOUBLE_TO_INT.S
index d3882f3..f66dc5f 100644
--- a/vm/mterp/armv6t2/OP_DOUBLE_TO_INT.S
+++ b/vm/mterp/armv6t2/OP_DOUBLE_TO_INT.S
@@ -52,4 +52,3 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
#endif
-
diff --git a/vm/mterp/armv6t2/OP_DOUBLE_TO_LONG.S b/vm/mterp/armv6t2/OP_DOUBLE_TO_LONG.S
index a9ecab7..ac751de 100644
--- a/vm/mterp/armv6t2/OP_DOUBLE_TO_LONG.S
+++ b/vm/mterp/armv6t2/OP_DOUBLE_TO_LONG.S
@@ -51,4 +51,3 @@
1:
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
diff --git a/vm/mterp/armv6t2/OP_FLOAT_TO_INT.S b/vm/mterp/armv6t2/OP_FLOAT_TO_INT.S
index 444ebae..4ba28e7 100644
--- a/vm/mterp/armv6t2/OP_FLOAT_TO_INT.S
+++ b/vm/mterp/armv6t2/OP_FLOAT_TO_INT.S
@@ -38,4 +38,3 @@
bl __aeabi_f2iz @ convert float to int
ldmfd sp!, {r4, pc}
#endif
-
diff --git a/vm/mterp/armv6t2/OP_FLOAT_TO_LONG.S b/vm/mterp/armv6t2/OP_FLOAT_TO_LONG.S
index 5efd04b..168e338 100644
--- a/vm/mterp/armv6t2/OP_FLOAT_TO_LONG.S
+++ b/vm/mterp/armv6t2/OP_FLOAT_TO_LONG.S
@@ -38,4 +38,3 @@
mov r0, r4 @ recover arg
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
diff --git a/vm/mterp/armv6t2/OP_IGET.S b/vm/mterp/armv6t2/OP_IGET.S
index 537c534..f5a21eb 100644
--- a/vm/mterp/armv6t2/OP_IGET.S
+++ b/vm/mterp/armv6t2/OP_IGET.S
@@ -43,4 +43,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IGET_QUICK.S b/vm/mterp/armv6t2/OP_IGET_QUICK.S
index 83714d5..0ce2ebc 100644
--- a/vm/mterp/armv6t2/OP_IGET_QUICK.S
+++ b/vm/mterp/armv6t2/OP_IGET_QUICK.S
@@ -13,4 +13,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IGET_WIDE.S b/vm/mterp/armv6t2/OP_IGET_WIDE.S
index 948d53d..92cd1a6 100644
--- a/vm/mterp/armv6t2/OP_IGET_WIDE.S
+++ b/vm/mterp/armv6t2/OP_IGET_WIDE.S
@@ -40,4 +40,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IGET_WIDE_QUICK.S b/vm/mterp/armv6t2/OP_IGET_WIDE_QUICK.S
index 98abf72..067d40d 100644
--- a/vm/mterp/armv6t2/OP_IGET_WIDE_QUICK.S
+++ b/vm/mterp/armv6t2/OP_IGET_WIDE_QUICK.S
@@ -13,4 +13,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IPUT.S b/vm/mterp/armv6t2/OP_IPUT.S
index 10eea24..b69443b 100644
--- a/vm/mterp/armv6t2/OP_IPUT.S
+++ b/vm/mterp/armv6t2/OP_IPUT.S
@@ -43,4 +43,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
$store r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IPUT_QUICK.S b/vm/mterp/armv6t2/OP_IPUT_QUICK.S
index 0b6d61c..ad87b55 100644
--- a/vm/mterp/armv6t2/OP_IPUT_QUICK.S
+++ b/vm/mterp/armv6t2/OP_IPUT_QUICK.S
@@ -13,4 +13,3 @@
str r0, [r3, r1] @ obj.field (always 32 bits)<- r0
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IPUT_WIDE.S b/vm/mterp/armv6t2/OP_IPUT_WIDE.S
index 5c1ab97..334e352 100644
--- a/vm/mterp/armv6t2/OP_IPUT_WIDE.S
+++ b/vm/mterp/armv6t2/OP_IPUT_WIDE.S
@@ -37,4 +37,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
strd r0, [r9, r3] @ obj.field (64 bits, aligned)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_IPUT_WIDE_QUICK.S b/vm/mterp/armv6t2/OP_IPUT_WIDE_QUICK.S
index 5cf4798..09f7a8e 100644
--- a/vm/mterp/armv6t2/OP_IPUT_WIDE_QUICK.S
+++ b/vm/mterp/armv6t2/OP_IPUT_WIDE_QUICK.S
@@ -13,4 +13,3 @@
strd r0, [r2, r3] @ obj.field (64 bits, aligned)<- r0/r1
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_MOVE.S b/vm/mterp/armv6t2/OP_MOVE.S
index 0c11d1a..3047158 100644
--- a/vm/mterp/armv6t2/OP_MOVE.S
+++ b/vm/mterp/armv6t2/OP_MOVE.S
@@ -8,4 +8,3 @@
GET_INST_OPCODE(ip) @ ip<- opcode from rINST
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
diff --git a/vm/mterp/armv6t2/OP_MOVE_WIDE.S b/vm/mterp/armv6t2/OP_MOVE_WIDE.S
index c896e62..adc2c95 100644
--- a/vm/mterp/armv6t2/OP_MOVE_WIDE.S
+++ b/vm/mterp/armv6t2/OP_MOVE_WIDE.S
@@ -10,4 +10,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_MUL_LONG_2ADDR.S b/vm/mterp/armv6t2/OP_MUL_LONG_2ADDR.S
index c050ecc..1526a1e 100644
--- a/vm/mterp/armv6t2/OP_MUL_LONG_2ADDR.S
+++ b/vm/mterp/armv6t2/OP_MUL_LONG_2ADDR.S
@@ -23,4 +23,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_SHL_LONG_2ADDR.S b/vm/mterp/armv6t2/OP_SHL_LONG_2ADDR.S
index bad569a..502481e 100644
--- a/vm/mterp/armv6t2/OP_SHL_LONG_2ADDR.S
+++ b/vm/mterp/armv6t2/OP_SHL_LONG_2ADDR.S
@@ -25,4 +25,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_SHR_LONG_2ADDR.S b/vm/mterp/armv6t2/OP_SHR_LONG_2ADDR.S
index fa77b61..501b3f2 100644
--- a/vm/mterp/armv6t2/OP_SHR_LONG_2ADDR.S
+++ b/vm/mterp/armv6t2/OP_SHR_LONG_2ADDR.S
@@ -25,4 +25,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/OP_USHR_LONG_2ADDR.S b/vm/mterp/armv6t2/OP_USHR_LONG_2ADDR.S
index 1183d1f..a1fcef4 100644
--- a/vm/mterp/armv6t2/OP_USHR_LONG_2ADDR.S
+++ b/vm/mterp/armv6t2/OP_USHR_LONG_2ADDR.S
@@ -25,4 +25,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
diff --git a/vm/mterp/armv6t2/bincmp.S b/vm/mterp/armv6t2/bincmp.S
index f3b81b0..002eeed 100644
--- a/vm/mterp/armv6t2/bincmp.S
+++ b/vm/mterp/armv6t2/bincmp.S
@@ -28,4 +28,3 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
diff --git a/vm/mterp/armv6t2/binop2addr.S b/vm/mterp/armv6t2/binop2addr.S
index 9b421bc..b402156 100644
--- a/vm/mterp/armv6t2/binop2addr.S
+++ b/vm/mterp/armv6t2/binop2addr.S
@@ -30,4 +30,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-13 instructions */
-
diff --git a/vm/mterp/armv6t2/binopLit16.S b/vm/mterp/armv6t2/binopLit16.S
index 7bc9902..1f67524 100644
--- a/vm/mterp/armv6t2/binopLit16.S
+++ b/vm/mterp/armv6t2/binopLit16.S
@@ -27,4 +27,3 @@
SET_VREG($result, r9) @ vAA<- $result
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-13 instructions */
-
diff --git a/vm/mterp/armv6t2/binopWide2addr.S b/vm/mterp/armv6t2/binopWide2addr.S
index af83c7b..0b4691f 100644
--- a/vm/mterp/armv6t2/binopWide2addr.S
+++ b/vm/mterp/armv6t2/binopWide2addr.S
@@ -32,4 +32,3 @@
stmia r9, {$result0,$result1} @ vAA/vAA+1<- $result0/$result1
GOTO_OPCODE(ip) @ jump to next instruction
/* 12-15 instructions */
-
diff --git a/vm/mterp/armv6t2/unopWide.S b/vm/mterp/armv6t2/unopWide.S
index 62d8645..e0a303e 100644
--- a/vm/mterp/armv6t2/unopWide.S
+++ b/vm/mterp/armv6t2/unopWide.S
@@ -19,4 +19,3 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
/* 10-11 instructions */
-
diff --git a/vm/mterp/c/OP_NEW_ARRAY.c b/vm/mterp/c/OP_NEW_ARRAY.c
index 22af516..525c43b 100644
--- a/vm/mterp/c/OP_NEW_ARRAY.c
+++ b/vm/mterp/c/OP_NEW_ARRAY.c
@@ -33,4 +33,3 @@
}
FINISH(2);
OP_END
-
diff --git a/vm/mterp/config-allstubs b/vm/mterp/config-allstubs
index 72166aa..23796d8 100644
--- a/vm/mterp/config-allstubs
+++ b/vm/mterp/config-allstubs
@@ -42,4 +42,3 @@
# finish
import cstubs/enddefs.c
-
diff --git a/vm/mterp/config-armv4t b/vm/mterp/config-armv4t
index 9746376..ed39b42 100644
--- a/vm/mterp/config-armv4t
+++ b/vm/mterp/config-armv4t
@@ -66,4 +66,3 @@
# common subroutines for asm
import armv5te/footer.S
import armv5te/debug.c
-
diff --git a/vm/mterp/config-armv5te b/vm/mterp/config-armv5te
index 8b4838e..2dceb04 100644
--- a/vm/mterp/config-armv5te
+++ b/vm/mterp/config-armv5te
@@ -52,4 +52,3 @@
# common subroutines for asm
import armv5te/footer.S
import armv5te/debug.c
-
diff --git a/vm/mterp/config-armv5te-vfp b/vm/mterp/config-armv5te-vfp
index cc77002..ce0c521 100644
--- a/vm/mterp/config-armv5te-vfp
+++ b/vm/mterp/config-armv5te-vfp
@@ -102,4 +102,3 @@
# common subroutines for asm
import armv5te/footer.S
import armv5te/debug.c
-
diff --git a/vm/mterp/config-armv7-a b/vm/mterp/config-armv7-a
index 9193632..be32042 100644
--- a/vm/mterp/config-armv7-a
+++ b/vm/mterp/config-armv7-a
@@ -164,4 +164,3 @@
# common subroutines for asm
import armv5te/footer.S
import armv5te/debug.c
-
diff --git a/vm/mterp/config-armv7-a-neon b/vm/mterp/config-armv7-a-neon
index 9193632..be32042 100644
--- a/vm/mterp/config-armv7-a-neon
+++ b/vm/mterp/config-armv7-a-neon
@@ -164,4 +164,3 @@
# common subroutines for asm
import armv5te/footer.S
import armv5te/debug.c
-
diff --git a/vm/mterp/config-portdbg b/vm/mterp/config-portdbg
index 7e1de14..c6982d7 100644
--- a/vm/mterp/config-portdbg
+++ b/vm/mterp/config-portdbg
@@ -47,4 +47,3 @@
# finish
import portable/enddefs.c
-
diff --git a/vm/mterp/config-portstd b/vm/mterp/config-portstd
index fad4e68..41ecb4f 100644
--- a/vm/mterp/config-portstd
+++ b/vm/mterp/config-portstd
@@ -46,4 +46,3 @@
# finish
import portable/enddefs.c
-
diff --git a/vm/mterp/config-x86 b/vm/mterp/config-x86
index 6ff472c..627e06c 100644
--- a/vm/mterp/config-x86
+++ b/vm/mterp/config-x86
@@ -54,4 +54,3 @@
# common subroutines for asm
import x86/footer.S
-
diff --git a/vm/mterp/config-x86-atom b/vm/mterp/config-x86-atom
index 53f89ae..0d9b193 100644
--- a/vm/mterp/config-x86-atom
+++ b/vm/mterp/config-x86-atom
@@ -302,5 +302,3 @@
# common subroutines for asm
import x86-atom/footer.S
-
-
diff --git a/vm/mterp/cstubs/entry.c b/vm/mterp/cstubs/entry.c
index 0597d19..af31a3d 100644
--- a/vm/mterp/cstubs/entry.c
+++ b/vm/mterp/cstubs/entry.c
@@ -78,4 +78,3 @@
jmp_buf* pJmpBuf = glue->bailPtr;
longjmp(*pJmpBuf, ((int)changeInterp)+1);
}
-
diff --git a/vm/mterp/out/InterpAsm-armv4t.S b/vm/mterp/out/InterpAsm-armv4t.S
index 45c0941..e94dbfb 100644
--- a/vm/mterp/out/InterpAsm-armv4t.S
+++ b/vm/mterp/out/InterpAsm-armv4t.S
@@ -242,7 +242,6 @@
ldmfd sp!, {\regs,pc}
.endm
-
/* File: armv5te/entry.S */
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -396,7 +395,6 @@
.word .LstrBadEntryPoint
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -420,7 +418,6 @@
.fnend
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -436,7 +433,6 @@
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_FROM16: /* 0x02 */
@@ -451,7 +447,6 @@
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -466,7 +461,6 @@
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE: /* 0x04 */
@@ -484,7 +478,6 @@
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_FROM16: /* 0x05 */
@@ -501,7 +494,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -518,7 +510,6 @@
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT: /* 0x07 */
@@ -536,7 +527,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_FROM16: /* 0x08 */
@@ -553,7 +543,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -570,7 +559,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT: /* 0x0a */
@@ -584,7 +572,6 @@
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_WIDE: /* 0x0b */
@@ -599,7 +586,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_OBJECT: /* 0x0c */
@@ -615,7 +601,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_EXCEPTION: /* 0x0d */
@@ -631,14 +616,12 @@
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
/* File: armv5te/OP_RETURN_VOID.S */
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -655,7 +638,6 @@
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -672,7 +654,6 @@
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_OBJECT: /* 0x11 */
@@ -691,7 +672,6 @@
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -706,7 +686,6 @@
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -719,7 +698,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST: /* 0x14 */
@@ -734,7 +712,6 @@
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_HIGH16: /* 0x15 */
@@ -748,7 +725,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_16: /* 0x16 */
@@ -763,7 +739,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_32: /* 0x17 */
@@ -780,7 +755,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE: /* 0x18 */
@@ -799,7 +773,6 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -815,7 +788,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -894,7 +866,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -923,7 +894,6 @@
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -999,7 +969,6 @@
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_NEW_INSTANCE: /* 0x22 */
@@ -1142,7 +1111,6 @@
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -1198,7 +1166,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_32: /* 0x2a */
@@ -1271,7 +1238,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_SPARSE_SWITCH: /* 0x2c */
@@ -1311,7 +1277,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
@@ -1567,7 +1532,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NE: /* 0x33 */
@@ -1604,7 +1568,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LT: /* 0x34 */
@@ -1641,7 +1604,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GE: /* 0x35 */
@@ -1678,7 +1640,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GT: /* 0x36 */
@@ -1715,7 +1676,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LE: /* 0x37 */
@@ -1752,7 +1712,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_EQZ: /* 0x38 */
@@ -1789,7 +1748,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1826,7 +1784,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1863,7 +1820,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1900,7 +1856,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1937,7 +1892,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1974,7 +1928,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1983,7 +1936,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -1992,7 +1944,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -2001,7 +1952,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -2010,7 +1960,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -2019,7 +1968,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -2028,7 +1976,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -2059,7 +2006,6 @@
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -2119,7 +2065,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -2152,7 +2097,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -2185,7 +2129,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -2218,7 +2161,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -2251,7 +2193,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -2282,7 +2223,6 @@
str r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -2368,7 +2308,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -2401,7 +2340,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -2434,7 +2372,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -2467,7 +2404,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3335,7 +3271,6 @@
bne common_invokeMethodNoRange @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE: /* 0x72 */
@@ -3364,7 +3299,6 @@
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethodNoRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_73: /* 0x73 */
@@ -3373,7 +3307,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -3500,7 +3433,6 @@
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
@@ -3531,7 +3463,6 @@
b common_invokeMethodRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_79: /* 0x79 */
@@ -3540,7 +3471,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -3549,7 +3479,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -3632,7 +3561,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -3661,7 +3589,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -3717,7 +3644,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -3817,7 +3743,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_LONG_TO_FLOAT: /* 0x85 */
@@ -3876,7 +3801,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -3942,7 +3866,6 @@
ldmfd sp!, {r4, pc}
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_LONG: /* 0x88 */
@@ -4081,7 +4004,6 @@
ldmfd sp!, {r4, r5, pc}
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_LONG: /* 0x8b */
@@ -4112,7 +4034,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
@@ -4265,7 +4186,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -4307,7 +4227,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -4350,7 +4269,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT: /* 0x93 */
@@ -4392,7 +4310,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -4435,7 +4352,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT: /* 0x95 */
@@ -4477,7 +4393,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -4519,7 +4434,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -4561,7 +4475,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4603,7 +4516,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT: /* 0x99 */
@@ -4645,7 +4557,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT: /* 0x9a */
@@ -4687,7 +4598,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG: /* 0x9b */
@@ -4732,7 +4642,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG: /* 0x9c */
@@ -4777,7 +4686,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG: /* 0x9d */
@@ -4861,7 +4769,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG: /* 0x9f */
@@ -4907,7 +4814,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG: /* 0xa0 */
@@ -4952,7 +4858,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG: /* 0xa1 */
@@ -4997,7 +4902,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG: /* 0xa2 */
@@ -5042,7 +4946,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG: /* 0xa3 */
@@ -5171,7 +5074,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT: /* 0xa7 */
@@ -5213,7 +5115,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT: /* 0xa8 */
@@ -5255,7 +5156,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT: /* 0xa9 */
@@ -5297,7 +5197,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_FLOAT: /* 0xaa */
@@ -5340,7 +5239,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -5385,7 +5283,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE: /* 0xac */
@@ -5430,7 +5327,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE: /* 0xad */
@@ -5475,7 +5371,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE: /* 0xae */
@@ -5520,7 +5415,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE: /* 0xaf */
@@ -5566,7 +5460,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_2ADDR: /* 0xb0 */
@@ -5606,7 +5499,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -5646,7 +5538,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -5687,7 +5578,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_2ADDR: /* 0xb3 */
@@ -5727,7 +5617,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -5768,7 +5657,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -5808,7 +5696,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -5848,7 +5735,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -5888,7 +5774,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -5928,7 +5813,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -5968,7 +5852,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -6008,7 +5891,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -6050,7 +5932,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG_2ADDR: /* 0xbc */
@@ -6092,7 +5973,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG_2ADDR: /* 0xbd */
@@ -6123,7 +6003,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_LONG_2ADDR: /* 0xbe */
@@ -6165,7 +6044,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG_2ADDR: /* 0xbf */
@@ -6208,7 +6086,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG_2ADDR: /* 0xc0 */
@@ -6250,7 +6127,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG_2ADDR: /* 0xc1 */
@@ -6292,7 +6168,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG_2ADDR: /* 0xc2 */
@@ -6334,7 +6209,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG_2ADDR: /* 0xc3 */
@@ -6452,7 +6326,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
@@ -6492,7 +6365,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
@@ -6532,7 +6404,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
@@ -6572,7 +6443,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_FLOAT_2ADDR: /* 0xca */
@@ -6613,7 +6483,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -6655,7 +6524,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
@@ -6697,7 +6565,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
@@ -6739,7 +6606,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE_2ADDR: /* 0xce */
@@ -6781,7 +6647,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE_2ADDR: /* 0xcf */
@@ -6824,7 +6689,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT16: /* 0xd0 */
@@ -6861,7 +6725,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT: /* 0xd1 */
@@ -6899,7 +6762,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT16: /* 0xd2 */
@@ -6937,7 +6799,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT16: /* 0xd3 */
@@ -6974,7 +6835,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT16: /* 0xd4 */
@@ -7012,7 +6872,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT16: /* 0xd5 */
@@ -7049,7 +6908,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT16: /* 0xd6 */
@@ -7086,7 +6944,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -7123,7 +6980,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT8: /* 0xd8 */
@@ -7162,7 +7018,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT_LIT8: /* 0xd9 */
@@ -7201,7 +7056,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -7241,7 +7095,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -7280,7 +7133,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT8: /* 0xdc */
@@ -7320,7 +7172,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT8: /* 0xdd */
@@ -7359,7 +7210,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT8: /* 0xde */
@@ -7398,7 +7248,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -7437,7 +7286,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_LIT8: /* 0xe0 */
@@ -7476,7 +7324,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_LIT8: /* 0xe1 */
@@ -7515,7 +7362,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_LIT8: /* 0xe2 */
@@ -7554,7 +7400,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E3: /* 0xe3 */
@@ -7563,7 +7408,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -7572,7 +7416,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -7581,7 +7424,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -7590,7 +7432,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -7599,7 +7440,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -7717,7 +7557,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_THROW_VERIFICATION_ERROR: /* 0xed */
@@ -7735,7 +7574,6 @@
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -7814,7 +7652,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -7834,7 +7671,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_QUICK: /* 0xf3 */
@@ -7855,7 +7691,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -7877,7 +7712,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_QUICK: /* 0xf5 */
@@ -7897,7 +7731,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -7918,7 +7751,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -7940,7 +7772,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -8020,7 +7851,6 @@
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethodNoRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -8050,7 +7880,6 @@
bl common_invokeMethodRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -8059,7 +7888,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -8068,7 +7896,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -8077,7 +7904,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -8087,7 +7913,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -8123,7 +7948,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_STRING_JUMBO */
/*
@@ -8143,7 +7967,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_CLASS */
/*
@@ -8164,7 +7987,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CHECK_CAST */
/*
@@ -8209,7 +8031,6 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
/* continuation for OP_INSTANCE_OF */
/*
@@ -8265,7 +8086,6 @@
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .LOP_INSTANCE_OF_resolved @ pick up where we left off
-
/* continuation for OP_NEW_INSTANCE */
.balign 32 @ minimize cache lines
@@ -8308,7 +8128,6 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
/* continuation for OP_NEW_ARRAY */
@@ -8348,7 +8167,6 @@
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
/*
@@ -8427,7 +8245,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
/*
@@ -8506,7 +8323,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_CMPL_FLOAT */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8570,7 +8386,6 @@
#endif
-
/* continuation for OP_CMPG_FLOAT */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8634,7 +8449,6 @@
#endif
-
/* continuation for OP_CMPL_DOUBLE */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8650,7 +8464,6 @@
mvn r1, #0 @ r1<- 1 or -1 for NaN
b .LOP_CMPL_DOUBLE_finish
-
/* continuation for OP_CMPG_DOUBLE */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8666,7 +8479,6 @@
mov r1, #1 @ r1<- 1 or -1 for NaN
b .LOP_CMPG_DOUBLE_finish
-
/* continuation for OP_CMP_LONG */
.LOP_CMP_LONG_less:
@@ -8688,7 +8500,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_AGET_WIDE */
.LOP_AGET_WIDE_finish:
@@ -8700,7 +8511,6 @@
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -8711,7 +8521,6 @@
stmia r0, {r2-r3} @ vBB[vCC] <- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_OBJECT */
/*
* On entry:
@@ -8733,7 +8542,6 @@
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET */
/*
@@ -8754,7 +8562,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE */
/*
@@ -8781,7 +8588,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_OBJECT */
/*
@@ -8802,7 +8608,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BOOLEAN */
/*
@@ -8823,7 +8628,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BYTE */
/*
@@ -8844,7 +8648,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_CHAR */
/*
@@ -8865,7 +8668,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_SHORT */
/*
@@ -8886,7 +8688,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT */
/*
@@ -8907,7 +8708,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE */
/*
@@ -8933,7 +8733,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_IPUT_OBJECT */
/*
@@ -8954,7 +8753,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BOOLEAN */
/*
@@ -8975,7 +8773,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BYTE */
/*
@@ -8996,7 +8793,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_CHAR */
/*
@@ -9017,7 +8813,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_SHORT */
/*
@@ -9038,7 +8833,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SGET */
/*
@@ -9054,7 +8848,6 @@
bne .LOP_SGET_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -9072,7 +8865,6 @@
bne .LOP_SGET_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -9088,7 +8880,6 @@
bne .LOP_SGET_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -9104,7 +8895,6 @@
bne .LOP_SGET_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -9120,7 +8910,6 @@
bne .LOP_SGET_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -9136,7 +8925,6 @@
bne .LOP_SGET_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -9152,7 +8940,6 @@
bne .LOP_SGET_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -9168,7 +8955,6 @@
bne .LOP_SPUT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -9188,7 +8974,6 @@
bne .LOP_SPUT_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -9204,7 +8989,6 @@
bne .LOP_SPUT_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -9220,7 +9004,6 @@
bne .LOP_SPUT_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -9236,7 +9019,6 @@
bne .LOP_SPUT_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -9252,7 +9034,6 @@
bne .LOP_SPUT_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -9268,7 +9049,6 @@
bne .LOP_SPUT_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
/*
@@ -9286,7 +9066,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodNoRange @ continue on
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -9321,7 +9100,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -9339,7 +9117,6 @@
bne .LOP_INVOKE_DIRECT_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
/*
@@ -9357,7 +9134,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodRange @ continue on
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -9392,7 +9168,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -9410,7 +9185,6 @@
bne .LOP_INVOKE_DIRECT_RANGE_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_FLOAT_TO_LONG */
/*
* Convert the float in r0 to a long in r0/r1.
@@ -9448,7 +9222,6 @@
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
/* continuation for OP_DOUBLE_TO_LONG */
/*
* Convert the double in r0/r1 to a long in r0/r1.
@@ -9499,7 +9272,6 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
/* continuation for OP_MUL_LONG */
.LOP_MUL_LONG_finish:
@@ -9507,7 +9279,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -9516,7 +9287,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG */
.LOP_SHR_LONG_finish:
@@ -9525,7 +9295,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG */
.LOP_USHR_LONG_finish:
@@ -9534,7 +9303,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG_2ADDR */
.LOP_SHL_LONG_2ADDR_finish:
@@ -9542,7 +9310,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG_2ADDR */
.LOP_SHR_LONG_2ADDR_finish:
@@ -9550,7 +9317,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG_2ADDR */
.LOP_USHR_LONG_2ADDR_finish:
@@ -9558,7 +9324,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE_VOLATILE */
/*
@@ -9585,7 +9350,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE_VOLATILE */
/*
@@ -9611,7 +9375,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_SGET_WIDE_VOLATILE */
/*
@@ -9629,7 +9392,6 @@
bne .LOP_SGET_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE_VOLATILE */
/*
@@ -9649,7 +9411,6 @@
bne .LOP_SPUT_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_EXECUTE_INLINE */
/*
@@ -9685,7 +9446,6 @@
.LOP_EXECUTE_INLINE_table:
.word gDvmInlineOpsTable
-
/* continuation for OP_EXECUTE_INLINE_RANGE */
/*
@@ -9715,7 +9475,6 @@
.LOP_EXECUTE_INLINE_RANGE_table:
.word gDvmInlineOpsTable
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -10947,4 +10706,3 @@
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 67c87e0..fa0a04d 100644
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -242,7 +242,6 @@
ldmfd sp!, {\regs,pc}
.endm
-
/* File: armv5te/entry.S */
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -396,7 +395,6 @@
.word .LstrBadEntryPoint
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -420,7 +418,6 @@
.fnend
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -436,7 +433,6 @@
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_FROM16: /* 0x02 */
@@ -451,7 +447,6 @@
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -466,7 +461,6 @@
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE: /* 0x04 */
@@ -484,7 +478,6 @@
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_FROM16: /* 0x05 */
@@ -501,7 +494,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -518,7 +510,6 @@
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT: /* 0x07 */
@@ -536,7 +527,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_FROM16: /* 0x08 */
@@ -553,7 +543,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -570,7 +559,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT: /* 0x0a */
@@ -584,7 +572,6 @@
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_WIDE: /* 0x0b */
@@ -599,7 +586,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_OBJECT: /* 0x0c */
@@ -615,7 +601,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_EXCEPTION: /* 0x0d */
@@ -631,14 +616,12 @@
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
/* File: armv5te/OP_RETURN_VOID.S */
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -655,7 +638,6 @@
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -672,7 +654,6 @@
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_OBJECT: /* 0x11 */
@@ -691,7 +672,6 @@
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -706,7 +686,6 @@
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -719,7 +698,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST: /* 0x14 */
@@ -734,7 +712,6 @@
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_HIGH16: /* 0x15 */
@@ -748,7 +725,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_16: /* 0x16 */
@@ -763,7 +739,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_32: /* 0x17 */
@@ -780,7 +755,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE: /* 0x18 */
@@ -799,7 +773,6 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -815,7 +788,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -894,7 +866,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -923,7 +894,6 @@
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -999,7 +969,6 @@
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_NEW_INSTANCE: /* 0x22 */
@@ -1142,7 +1111,6 @@
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -1198,7 +1166,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_32: /* 0x2a */
@@ -1271,7 +1238,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_SPARSE_SWITCH: /* 0x2c */
@@ -1311,7 +1277,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
@@ -1545,7 +1510,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NE: /* 0x33 */
@@ -1582,7 +1546,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LT: /* 0x34 */
@@ -1619,7 +1582,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GE: /* 0x35 */
@@ -1656,7 +1618,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GT: /* 0x36 */
@@ -1693,7 +1654,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LE: /* 0x37 */
@@ -1730,7 +1690,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_EQZ: /* 0x38 */
@@ -1767,7 +1726,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1804,7 +1762,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1841,7 +1798,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1878,7 +1834,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1915,7 +1870,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1952,7 +1906,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1961,7 +1914,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -1970,7 +1922,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -1979,7 +1930,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -1988,7 +1938,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -1997,7 +1946,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -2006,7 +1954,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -2037,7 +1984,6 @@
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -2097,7 +2043,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -2130,7 +2075,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -2163,7 +2107,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -2196,7 +2139,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -2229,7 +2171,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -2260,7 +2201,6 @@
str r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -2348,7 +2288,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -2381,7 +2320,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -2414,7 +2352,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -2447,7 +2384,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3315,7 +3251,6 @@
bne common_invokeMethodNoRange @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE: /* 0x72 */
@@ -3344,7 +3279,6 @@
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethodNoRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_73: /* 0x73 */
@@ -3353,7 +3287,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -3480,7 +3413,6 @@
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
@@ -3511,7 +3443,6 @@
b common_invokeMethodRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_79: /* 0x79 */
@@ -3520,7 +3451,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -3529,7 +3459,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -3612,7 +3541,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -3641,7 +3569,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -3697,7 +3624,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -3793,7 +3719,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_LONG_TO_FLOAT: /* 0x85 */
@@ -3852,7 +3777,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -3987,7 +3911,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
@@ -4135,7 +4058,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -4177,7 +4099,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -4220,7 +4141,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT: /* 0x93 */
@@ -4262,7 +4182,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -4305,7 +4224,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT: /* 0x95 */
@@ -4347,7 +4265,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -4389,7 +4306,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -4431,7 +4347,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4473,7 +4388,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT: /* 0x99 */
@@ -4515,7 +4429,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT: /* 0x9a */
@@ -4557,7 +4470,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG: /* 0x9b */
@@ -4602,7 +4514,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG: /* 0x9c */
@@ -4647,7 +4558,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG: /* 0x9d */
@@ -4731,7 +4641,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG: /* 0x9f */
@@ -4777,7 +4686,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG: /* 0xa0 */
@@ -4822,7 +4730,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG: /* 0xa1 */
@@ -4867,7 +4774,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG: /* 0xa2 */
@@ -4912,7 +4818,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG: /* 0xa3 */
@@ -5162,7 +5067,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -5328,7 +5232,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_2ADDR: /* 0xb0 */
@@ -5368,7 +5271,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -5408,7 +5310,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -5449,7 +5350,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_2ADDR: /* 0xb3 */
@@ -5489,7 +5389,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -5530,7 +5429,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -5570,7 +5468,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -5610,7 +5507,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -5650,7 +5546,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -5690,7 +5585,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -5730,7 +5624,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -5770,7 +5663,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -5812,7 +5704,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG_2ADDR: /* 0xbc */
@@ -5854,7 +5745,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG_2ADDR: /* 0xbd */
@@ -5885,7 +5775,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_LONG_2ADDR: /* 0xbe */
@@ -5927,7 +5816,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG_2ADDR: /* 0xbf */
@@ -5970,7 +5858,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG_2ADDR: /* 0xc0 */
@@ -6012,7 +5899,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG_2ADDR: /* 0xc1 */
@@ -6054,7 +5940,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG_2ADDR: /* 0xc2 */
@@ -6096,7 +5981,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG_2ADDR: /* 0xc3 */
@@ -6327,7 +6211,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -6486,7 +6369,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT16: /* 0xd0 */
@@ -6523,7 +6405,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT: /* 0xd1 */
@@ -6561,7 +6442,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT16: /* 0xd2 */
@@ -6599,7 +6479,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT16: /* 0xd3 */
@@ -6636,7 +6515,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT16: /* 0xd4 */
@@ -6674,7 +6552,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT16: /* 0xd5 */
@@ -6711,7 +6588,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT16: /* 0xd6 */
@@ -6748,7 +6624,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -6785,7 +6660,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT8: /* 0xd8 */
@@ -6824,7 +6698,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT_LIT8: /* 0xd9 */
@@ -6863,7 +6736,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -6903,7 +6775,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -6942,7 +6813,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT8: /* 0xdc */
@@ -6982,7 +6852,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT8: /* 0xdd */
@@ -7021,7 +6890,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT8: /* 0xde */
@@ -7060,7 +6928,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -7099,7 +6966,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_LIT8: /* 0xe0 */
@@ -7138,7 +7004,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_LIT8: /* 0xe1 */
@@ -7177,7 +7042,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_LIT8: /* 0xe2 */
@@ -7216,7 +7080,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E3: /* 0xe3 */
@@ -7225,7 +7088,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -7234,7 +7096,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -7243,7 +7104,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -7252,7 +7112,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -7261,7 +7120,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -7379,7 +7237,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_THROW_VERIFICATION_ERROR: /* 0xed */
@@ -7397,7 +7254,6 @@
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -7476,7 +7332,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -7496,7 +7351,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_QUICK: /* 0xf3 */
@@ -7516,7 +7370,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -7538,7 +7391,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_QUICK: /* 0xf5 */
@@ -7558,7 +7410,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -7578,7 +7429,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -7600,7 +7450,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -7680,7 +7529,6 @@
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethodNoRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -7710,7 +7558,6 @@
bl common_invokeMethodRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -7719,7 +7566,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -7728,7 +7574,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -7737,7 +7582,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -7747,7 +7591,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -7783,7 +7626,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_STRING_JUMBO */
/*
@@ -7803,7 +7645,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_CLASS */
/*
@@ -7824,7 +7665,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CHECK_CAST */
/*
@@ -7869,7 +7709,6 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
/* continuation for OP_INSTANCE_OF */
/*
@@ -7925,7 +7764,6 @@
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .LOP_INSTANCE_OF_resolved @ pick up where we left off
-
/* continuation for OP_NEW_INSTANCE */
.balign 32 @ minimize cache lines
@@ -7968,7 +7806,6 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
/* continuation for OP_NEW_ARRAY */
@@ -8008,7 +7845,6 @@
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
/*
@@ -8087,7 +7923,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
/*
@@ -8166,31 +8001,26 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_CMPL_FLOAT */
.LOP_CMPL_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_FLOAT */
.LOP_CMPG_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPL_DOUBLE */
.LOP_CMPL_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_DOUBLE */
.LOP_CMPG_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMP_LONG */
.LOP_CMP_LONG_less:
@@ -8212,7 +8042,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_AGET_WIDE */
.LOP_AGET_WIDE_finish:
@@ -8223,7 +8052,6 @@
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -8233,7 +8061,6 @@
strd r2, [r0, #offArrayObject_contents] @ r2/r3<- vBB[vCC]
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_OBJECT */
/*
* On entry:
@@ -8255,7 +8082,6 @@
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET */
/*
@@ -8276,7 +8102,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE */
/*
@@ -8302,7 +8127,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_OBJECT */
/*
@@ -8323,7 +8147,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BOOLEAN */
/*
@@ -8344,7 +8167,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BYTE */
/*
@@ -8365,7 +8187,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_CHAR */
/*
@@ -8386,7 +8207,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_SHORT */
/*
@@ -8407,7 +8227,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT */
/*
@@ -8428,7 +8247,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE */
/*
@@ -8454,7 +8272,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_IPUT_OBJECT */
/*
@@ -8475,7 +8292,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BOOLEAN */
/*
@@ -8496,7 +8312,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BYTE */
/*
@@ -8517,7 +8332,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_CHAR */
/*
@@ -8538,7 +8352,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_SHORT */
/*
@@ -8559,7 +8372,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SGET */
/*
@@ -8575,7 +8387,6 @@
bne .LOP_SGET_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -8593,7 +8404,6 @@
bne .LOP_SGET_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -8609,7 +8419,6 @@
bne .LOP_SGET_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -8625,7 +8434,6 @@
bne .LOP_SGET_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -8641,7 +8449,6 @@
bne .LOP_SGET_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -8657,7 +8464,6 @@
bne .LOP_SGET_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -8673,7 +8479,6 @@
bne .LOP_SGET_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -8689,7 +8494,6 @@
bne .LOP_SPUT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -8709,7 +8513,6 @@
bne .LOP_SPUT_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -8725,7 +8528,6 @@
bne .LOP_SPUT_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -8741,7 +8543,6 @@
bne .LOP_SPUT_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -8757,7 +8558,6 @@
bne .LOP_SPUT_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -8773,7 +8573,6 @@
bne .LOP_SPUT_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -8789,7 +8588,6 @@
bne .LOP_SPUT_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
/*
@@ -8807,7 +8605,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodNoRange @ continue on
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -8842,7 +8639,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -8860,7 +8656,6 @@
bne .LOP_INVOKE_DIRECT_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
/*
@@ -8878,7 +8673,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodRange @ continue on
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -8913,7 +8707,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -8931,7 +8724,6 @@
bne .LOP_INVOKE_DIRECT_RANGE_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_FLOAT_TO_LONG */
/*
* Convert the float in r0 to a long in r0/r1.
@@ -8969,7 +8761,6 @@
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
/* continuation for OP_DOUBLE_TO_LONG */
/*
* Convert the double in r0/r1 to a long in r0/r1.
@@ -9020,7 +8811,6 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
/* continuation for OP_MUL_LONG */
.LOP_MUL_LONG_finish:
@@ -9028,7 +8818,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -9037,7 +8826,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG */
.LOP_SHR_LONG_finish:
@@ -9046,7 +8834,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG */
.LOP_USHR_LONG_finish:
@@ -9055,7 +8842,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG_2ADDR */
.LOP_SHL_LONG_2ADDR_finish:
@@ -9063,7 +8849,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG_2ADDR */
.LOP_SHR_LONG_2ADDR_finish:
@@ -9071,7 +8856,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG_2ADDR */
.LOP_USHR_LONG_2ADDR_finish:
@@ -9079,7 +8863,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE_VOLATILE */
/*
@@ -9105,7 +8888,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE_VOLATILE */
/*
@@ -9131,7 +8913,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_SGET_WIDE_VOLATILE */
/*
@@ -9149,7 +8930,6 @@
bne .LOP_SGET_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE_VOLATILE */
/*
@@ -9169,7 +8949,6 @@
bne .LOP_SPUT_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_EXECUTE_INLINE */
/*
@@ -9205,7 +8984,6 @@
.LOP_EXECUTE_INLINE_table:
.word gDvmInlineOpsTable
-
/* continuation for OP_EXECUTE_INLINE_RANGE */
/*
@@ -9235,7 +9013,6 @@
.LOP_EXECUTE_INLINE_RANGE_table:
.word gDvmInlineOpsTable
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -10467,4 +10244,3 @@
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S
index 19d3bfb..c8e92d5 100644
--- a/vm/mterp/out/InterpAsm-armv5te.S
+++ b/vm/mterp/out/InterpAsm-armv5te.S
@@ -242,7 +242,6 @@
ldmfd sp!, {\regs,pc}
.endm
-
/* File: armv5te/entry.S */
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -396,7 +395,6 @@
.word .LstrBadEntryPoint
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -420,7 +418,6 @@
.fnend
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -436,7 +433,6 @@
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_FROM16: /* 0x02 */
@@ -451,7 +447,6 @@
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -466,7 +461,6 @@
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE: /* 0x04 */
@@ -484,7 +478,6 @@
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_FROM16: /* 0x05 */
@@ -501,7 +494,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -518,7 +510,6 @@
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT: /* 0x07 */
@@ -536,7 +527,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_FROM16: /* 0x08 */
@@ -553,7 +543,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -570,7 +559,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT: /* 0x0a */
@@ -584,7 +572,6 @@
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_WIDE: /* 0x0b */
@@ -599,7 +586,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_OBJECT: /* 0x0c */
@@ -615,7 +601,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_EXCEPTION: /* 0x0d */
@@ -631,14 +616,12 @@
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
/* File: armv5te/OP_RETURN_VOID.S */
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -655,7 +638,6 @@
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -672,7 +654,6 @@
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_OBJECT: /* 0x11 */
@@ -691,7 +672,6 @@
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -706,7 +686,6 @@
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -719,7 +698,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST: /* 0x14 */
@@ -734,7 +712,6 @@
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_HIGH16: /* 0x15 */
@@ -748,7 +725,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_16: /* 0x16 */
@@ -763,7 +739,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_32: /* 0x17 */
@@ -780,7 +755,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE: /* 0x18 */
@@ -799,7 +773,6 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -815,7 +788,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -894,7 +866,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -923,7 +894,6 @@
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -999,7 +969,6 @@
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_NEW_INSTANCE: /* 0x22 */
@@ -1142,7 +1111,6 @@
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -1198,7 +1166,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_32: /* 0x2a */
@@ -1271,7 +1238,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_SPARSE_SWITCH: /* 0x2c */
@@ -1311,7 +1277,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
@@ -1567,7 +1532,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NE: /* 0x33 */
@@ -1604,7 +1568,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LT: /* 0x34 */
@@ -1641,7 +1604,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GE: /* 0x35 */
@@ -1678,7 +1640,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GT: /* 0x36 */
@@ -1715,7 +1676,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LE: /* 0x37 */
@@ -1752,7 +1712,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_EQZ: /* 0x38 */
@@ -1789,7 +1748,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1826,7 +1784,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1863,7 +1820,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1900,7 +1856,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1937,7 +1892,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1974,7 +1928,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1983,7 +1936,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -1992,7 +1944,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -2001,7 +1952,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -2010,7 +1960,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -2019,7 +1968,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -2028,7 +1976,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -2059,7 +2006,6 @@
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -2119,7 +2065,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -2152,7 +2097,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -2185,7 +2129,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -2218,7 +2161,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -2251,7 +2193,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -2282,7 +2223,6 @@
str r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -2370,7 +2310,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -2403,7 +2342,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -2436,7 +2374,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -2469,7 +2406,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3337,7 +3273,6 @@
bne common_invokeMethodNoRange @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE: /* 0x72 */
@@ -3366,7 +3301,6 @@
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethodNoRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_73: /* 0x73 */
@@ -3375,7 +3309,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -3502,7 +3435,6 @@
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
@@ -3533,7 +3465,6 @@
b common_invokeMethodRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_79: /* 0x79 */
@@ -3542,7 +3473,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -3551,7 +3481,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -3634,7 +3563,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -3663,7 +3591,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -3719,7 +3646,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -3819,7 +3745,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_LONG_TO_FLOAT: /* 0x85 */
@@ -3878,7 +3803,6 @@
/* 12-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -3944,7 +3868,6 @@
ldmfd sp!, {r4, pc}
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_LONG: /* 0x88 */
@@ -4083,7 +4006,6 @@
ldmfd sp!, {r4, r5, pc}
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_LONG: /* 0x8b */
@@ -4114,7 +4036,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
@@ -4267,7 +4188,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -4309,7 +4229,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -4352,7 +4271,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT: /* 0x93 */
@@ -4394,7 +4312,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -4437,7 +4354,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT: /* 0x95 */
@@ -4479,7 +4395,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -4521,7 +4436,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -4563,7 +4477,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4605,7 +4518,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT: /* 0x99 */
@@ -4647,7 +4559,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT: /* 0x9a */
@@ -4689,7 +4600,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG: /* 0x9b */
@@ -4734,7 +4644,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG: /* 0x9c */
@@ -4779,7 +4688,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG: /* 0x9d */
@@ -4863,7 +4771,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG: /* 0x9f */
@@ -4909,7 +4816,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG: /* 0xa0 */
@@ -4954,7 +4860,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG: /* 0xa1 */
@@ -4999,7 +4904,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG: /* 0xa2 */
@@ -5044,7 +4948,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG: /* 0xa3 */
@@ -5173,7 +5076,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT: /* 0xa7 */
@@ -5215,7 +5117,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT: /* 0xa8 */
@@ -5257,7 +5158,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT: /* 0xa9 */
@@ -5299,7 +5199,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_FLOAT: /* 0xaa */
@@ -5342,7 +5241,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -5387,7 +5285,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE: /* 0xac */
@@ -5432,7 +5329,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE: /* 0xad */
@@ -5477,7 +5373,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE: /* 0xae */
@@ -5522,7 +5417,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE: /* 0xaf */
@@ -5568,7 +5462,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_2ADDR: /* 0xb0 */
@@ -5608,7 +5501,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -5648,7 +5540,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -5689,7 +5580,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_2ADDR: /* 0xb3 */
@@ -5729,7 +5619,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -5770,7 +5659,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -5810,7 +5698,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -5850,7 +5737,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -5890,7 +5776,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -5930,7 +5815,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -5970,7 +5854,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -6010,7 +5893,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -6052,7 +5934,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG_2ADDR: /* 0xbc */
@@ -6094,7 +5975,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG_2ADDR: /* 0xbd */
@@ -6125,7 +6005,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_LONG_2ADDR: /* 0xbe */
@@ -6167,7 +6046,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG_2ADDR: /* 0xbf */
@@ -6210,7 +6088,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG_2ADDR: /* 0xc0 */
@@ -6252,7 +6129,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG_2ADDR: /* 0xc1 */
@@ -6294,7 +6170,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG_2ADDR: /* 0xc2 */
@@ -6336,7 +6211,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG_2ADDR: /* 0xc3 */
@@ -6454,7 +6328,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
@@ -6494,7 +6367,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
@@ -6534,7 +6406,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
@@ -6574,7 +6445,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_FLOAT_2ADDR: /* 0xca */
@@ -6615,7 +6485,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -6657,7 +6526,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
@@ -6699,7 +6567,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
@@ -6741,7 +6608,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE_2ADDR: /* 0xce */
@@ -6783,7 +6649,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE_2ADDR: /* 0xcf */
@@ -6826,7 +6691,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT16: /* 0xd0 */
@@ -6863,7 +6727,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT: /* 0xd1 */
@@ -6901,7 +6764,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT16: /* 0xd2 */
@@ -6939,7 +6801,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT16: /* 0xd3 */
@@ -6976,7 +6837,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT16: /* 0xd4 */
@@ -7014,7 +6874,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT16: /* 0xd5 */
@@ -7051,7 +6910,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT16: /* 0xd6 */
@@ -7088,7 +6946,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -7125,7 +6982,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT8: /* 0xd8 */
@@ -7164,7 +7020,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT_LIT8: /* 0xd9 */
@@ -7203,7 +7058,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -7243,7 +7097,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -7282,7 +7135,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT8: /* 0xdc */
@@ -7322,7 +7174,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT8: /* 0xdd */
@@ -7361,7 +7212,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT8: /* 0xde */
@@ -7400,7 +7250,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -7439,7 +7288,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_LIT8: /* 0xe0 */
@@ -7478,7 +7326,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_LIT8: /* 0xe1 */
@@ -7517,7 +7364,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_LIT8: /* 0xe2 */
@@ -7556,7 +7402,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E3: /* 0xe3 */
@@ -7565,7 +7410,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -7574,7 +7418,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -7583,7 +7426,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -7592,7 +7434,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -7601,7 +7442,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -7719,7 +7559,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_THROW_VERIFICATION_ERROR: /* 0xed */
@@ -7737,7 +7576,6 @@
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -7816,7 +7654,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -7836,7 +7673,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_QUICK: /* 0xf3 */
@@ -7856,7 +7692,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -7878,7 +7713,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_QUICK: /* 0xf5 */
@@ -7898,7 +7732,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -7918,7 +7751,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -7940,7 +7772,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -8020,7 +7851,6 @@
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethodNoRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -8050,7 +7880,6 @@
bl common_invokeMethodRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -8059,7 +7888,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -8068,7 +7896,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -8077,7 +7904,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -8087,7 +7913,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -8123,7 +7948,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_STRING_JUMBO */
/*
@@ -8143,7 +7967,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_CLASS */
/*
@@ -8164,7 +7987,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CHECK_CAST */
/*
@@ -8209,7 +8031,6 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
/* continuation for OP_INSTANCE_OF */
/*
@@ -8265,7 +8086,6 @@
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .LOP_INSTANCE_OF_resolved @ pick up where we left off
-
/* continuation for OP_NEW_INSTANCE */
.balign 32 @ minimize cache lines
@@ -8308,7 +8128,6 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
/* continuation for OP_NEW_ARRAY */
@@ -8348,7 +8167,6 @@
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
/*
@@ -8427,7 +8245,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
/*
@@ -8506,7 +8323,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_CMPL_FLOAT */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8570,7 +8386,6 @@
#endif
-
/* continuation for OP_CMPG_FLOAT */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8634,7 +8449,6 @@
#endif
-
/* continuation for OP_CMPL_DOUBLE */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8650,7 +8464,6 @@
mvn r1, #0 @ r1<- 1 or -1 for NaN
b .LOP_CMPL_DOUBLE_finish
-
/* continuation for OP_CMPG_DOUBLE */
@ Test for NaN with a second comparison. EABI forbids testing bit
@@ -8666,7 +8479,6 @@
mov r1, #1 @ r1<- 1 or -1 for NaN
b .LOP_CMPG_DOUBLE_finish
-
/* continuation for OP_CMP_LONG */
.LOP_CMP_LONG_less:
@@ -8688,7 +8500,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_AGET_WIDE */
.LOP_AGET_WIDE_finish:
@@ -8699,7 +8510,6 @@
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -8709,7 +8519,6 @@
strd r2, [r0, #offArrayObject_contents] @ r2/r3<- vBB[vCC]
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_OBJECT */
/*
* On entry:
@@ -8731,7 +8540,6 @@
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET */
/*
@@ -8752,7 +8560,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE */
/*
@@ -8778,7 +8585,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_OBJECT */
/*
@@ -8799,7 +8605,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BOOLEAN */
/*
@@ -8820,7 +8625,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BYTE */
/*
@@ -8841,7 +8645,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_CHAR */
/*
@@ -8862,7 +8665,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_SHORT */
/*
@@ -8883,7 +8685,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT */
/*
@@ -8904,7 +8705,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE */
/*
@@ -8930,7 +8730,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_IPUT_OBJECT */
/*
@@ -8951,7 +8750,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BOOLEAN */
/*
@@ -8972,7 +8770,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BYTE */
/*
@@ -8993,7 +8790,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_CHAR */
/*
@@ -9014,7 +8810,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_SHORT */
/*
@@ -9035,7 +8830,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SGET */
/*
@@ -9051,7 +8845,6 @@
bne .LOP_SGET_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -9069,7 +8862,6 @@
bne .LOP_SGET_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -9085,7 +8877,6 @@
bne .LOP_SGET_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -9101,7 +8892,6 @@
bne .LOP_SGET_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -9117,7 +8907,6 @@
bne .LOP_SGET_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -9133,7 +8922,6 @@
bne .LOP_SGET_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -9149,7 +8937,6 @@
bne .LOP_SGET_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -9165,7 +8952,6 @@
bne .LOP_SPUT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -9185,7 +8971,6 @@
bne .LOP_SPUT_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -9201,7 +8986,6 @@
bne .LOP_SPUT_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -9217,7 +9001,6 @@
bne .LOP_SPUT_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -9233,7 +9016,6 @@
bne .LOP_SPUT_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -9249,7 +9031,6 @@
bne .LOP_SPUT_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -9265,7 +9046,6 @@
bne .LOP_SPUT_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
/*
@@ -9283,7 +9063,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodNoRange @ continue on
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -9318,7 +9097,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -9336,7 +9114,6 @@
bne .LOP_INVOKE_DIRECT_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
/*
@@ -9354,7 +9131,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodRange @ continue on
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -9389,7 +9165,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -9407,7 +9182,6 @@
bne .LOP_INVOKE_DIRECT_RANGE_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_FLOAT_TO_LONG */
/*
* Convert the float in r0 to a long in r0/r1.
@@ -9445,7 +9219,6 @@
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
/* continuation for OP_DOUBLE_TO_LONG */
/*
* Convert the double in r0/r1 to a long in r0/r1.
@@ -9496,7 +9269,6 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
/* continuation for OP_MUL_LONG */
.LOP_MUL_LONG_finish:
@@ -9504,7 +9276,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -9513,7 +9284,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG */
.LOP_SHR_LONG_finish:
@@ -9522,7 +9292,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG */
.LOP_USHR_LONG_finish:
@@ -9531,7 +9300,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG_2ADDR */
.LOP_SHL_LONG_2ADDR_finish:
@@ -9539,7 +9307,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG_2ADDR */
.LOP_SHR_LONG_2ADDR_finish:
@@ -9547,7 +9314,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG_2ADDR */
.LOP_USHR_LONG_2ADDR_finish:
@@ -9555,7 +9321,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE_VOLATILE */
/*
@@ -9581,7 +9346,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE_VOLATILE */
/*
@@ -9607,7 +9371,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_SGET_WIDE_VOLATILE */
/*
@@ -9625,7 +9388,6 @@
bne .LOP_SGET_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE_VOLATILE */
/*
@@ -9645,7 +9407,6 @@
bne .LOP_SPUT_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_EXECUTE_INLINE */
/*
@@ -9681,7 +9442,6 @@
.LOP_EXECUTE_INLINE_table:
.word gDvmInlineOpsTable
-
/* continuation for OP_EXECUTE_INLINE_RANGE */
/*
@@ -9711,7 +9471,6 @@
.LOP_EXECUTE_INLINE_RANGE_table:
.word gDvmInlineOpsTable
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -10943,4 +10702,3 @@
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S
index 741d831..31c9207 100644
--- a/vm/mterp/out/InterpAsm-armv7-a-neon.S
+++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S
@@ -242,7 +242,6 @@
ldmfd sp!, {\regs,pc}
.endm
-
/* File: armv5te/entry.S */
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -396,7 +395,6 @@
.word .LstrBadEntryPoint
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -420,7 +418,6 @@
.fnend
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -435,7 +432,6 @@
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_FROM16: /* 0x02 */
@@ -450,7 +446,6 @@
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -465,7 +460,6 @@
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE: /* 0x04 */
@@ -482,7 +476,6 @@
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_FROM16: /* 0x05 */
@@ -499,7 +492,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -516,7 +508,6 @@
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT: /* 0x07 */
@@ -534,7 +525,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_FROM16: /* 0x08 */
@@ -551,7 +541,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -568,7 +557,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT: /* 0x0a */
@@ -582,7 +570,6 @@
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_WIDE: /* 0x0b */
@@ -597,7 +584,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_OBJECT: /* 0x0c */
@@ -613,7 +599,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_EXCEPTION: /* 0x0d */
@@ -629,14 +614,12 @@
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
/* File: armv5te/OP_RETURN_VOID.S */
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -653,7 +636,6 @@
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -670,7 +652,6 @@
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_OBJECT: /* 0x11 */
@@ -689,7 +670,6 @@
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -703,7 +683,6 @@
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -716,7 +695,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST: /* 0x14 */
@@ -731,7 +709,6 @@
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_HIGH16: /* 0x15 */
@@ -745,7 +722,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_16: /* 0x16 */
@@ -760,7 +736,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_32: /* 0x17 */
@@ -777,7 +752,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE: /* 0x18 */
@@ -796,7 +770,6 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -812,7 +785,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -891,7 +863,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -920,7 +891,6 @@
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -995,7 +965,6 @@
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_NEW_INSTANCE: /* 0x22 */
@@ -1138,7 +1107,6 @@
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -1194,7 +1162,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_32: /* 0x2a */
@@ -1267,7 +1234,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_SPARSE_SWITCH: /* 0x2c */
@@ -1307,7 +1273,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
@@ -1540,7 +1505,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NE: /* 0x33 */
@@ -1576,7 +1540,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LT: /* 0x34 */
@@ -1612,7 +1575,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GE: /* 0x35 */
@@ -1648,7 +1610,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GT: /* 0x36 */
@@ -1684,7 +1645,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LE: /* 0x37 */
@@ -1720,7 +1680,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_EQZ: /* 0x38 */
@@ -1757,7 +1716,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1794,7 +1752,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1831,7 +1788,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1868,7 +1824,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1905,7 +1860,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1942,7 +1896,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1951,7 +1904,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -1960,7 +1912,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -1969,7 +1920,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -1978,7 +1928,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -1987,7 +1936,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -1996,7 +1944,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -2027,7 +1974,6 @@
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -2087,7 +2033,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -2120,7 +2065,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -2153,7 +2097,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -2186,7 +2129,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -2219,7 +2161,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -2250,7 +2191,6 @@
str r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -2338,7 +2278,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -2371,7 +2310,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -2404,7 +2342,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -2437,7 +2374,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3305,7 +3241,6 @@
bne common_invokeMethodNoRange @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE: /* 0x72 */
@@ -3334,7 +3269,6 @@
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethodNoRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_73: /* 0x73 */
@@ -3343,7 +3277,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -3470,7 +3403,6 @@
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
@@ -3501,7 +3433,6 @@
b common_invokeMethodRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_79: /* 0x79 */
@@ -3510,7 +3441,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -3519,7 +3449,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -3599,7 +3528,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -3627,7 +3555,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -3681,7 +3608,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -3776,7 +3702,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_LONG_TO_FLOAT: /* 0x85 */
@@ -3833,7 +3758,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -3966,7 +3890,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
@@ -4111,7 +4034,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -4153,7 +4075,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -4196,7 +4117,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT: /* 0x93 */
@@ -4238,7 +4158,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -4281,7 +4200,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT: /* 0x95 */
@@ -4323,7 +4241,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -4365,7 +4282,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -4407,7 +4323,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4449,7 +4364,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT: /* 0x99 */
@@ -4491,7 +4405,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT: /* 0x9a */
@@ -4533,7 +4446,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG: /* 0x9b */
@@ -4578,7 +4490,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG: /* 0x9c */
@@ -4623,7 +4534,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG: /* 0x9d */
@@ -4707,7 +4617,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG: /* 0x9f */
@@ -4753,7 +4662,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG: /* 0xa0 */
@@ -4798,7 +4706,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG: /* 0xa1 */
@@ -4843,7 +4750,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG: /* 0xa2 */
@@ -4888,7 +4794,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG: /* 0xa3 */
@@ -5138,7 +5043,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -5304,7 +5208,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_2ADDR: /* 0xb0 */
@@ -5343,7 +5246,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -5382,7 +5284,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -5422,7 +5323,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_2ADDR: /* 0xb3 */
@@ -5461,7 +5361,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -5501,7 +5400,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -5540,7 +5438,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -5579,7 +5476,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -5618,7 +5514,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -5657,7 +5552,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -5696,7 +5590,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -5735,7 +5628,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -5776,7 +5668,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG_2ADDR: /* 0xbc */
@@ -5817,7 +5708,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG_2ADDR: /* 0xbd */
@@ -5847,7 +5737,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_LONG_2ADDR: /* 0xbe */
@@ -5888,7 +5777,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG_2ADDR: /* 0xbf */
@@ -5930,7 +5818,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG_2ADDR: /* 0xc0 */
@@ -5971,7 +5858,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG_2ADDR: /* 0xc1 */
@@ -6012,7 +5898,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG_2ADDR: /* 0xc2 */
@@ -6053,7 +5938,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG_2ADDR: /* 0xc3 */
@@ -6280,7 +6164,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -6438,7 +6321,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT16: /* 0xd0 */
@@ -6474,7 +6356,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT: /* 0xd1 */
@@ -6511,7 +6392,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT16: /* 0xd2 */
@@ -6548,7 +6428,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT16: /* 0xd3 */
@@ -6584,7 +6463,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT16: /* 0xd4 */
@@ -6621,7 +6499,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT16: /* 0xd5 */
@@ -6657,7 +6534,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT16: /* 0xd6 */
@@ -6693,7 +6569,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -6729,7 +6604,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT8: /* 0xd8 */
@@ -6768,7 +6642,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT_LIT8: /* 0xd9 */
@@ -6807,7 +6680,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -6847,7 +6719,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -6886,7 +6757,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT8: /* 0xdc */
@@ -6926,7 +6796,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT8: /* 0xdd */
@@ -6965,7 +6834,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT8: /* 0xde */
@@ -7004,7 +6872,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -7043,7 +6910,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_LIT8: /* 0xe0 */
@@ -7082,7 +6948,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_LIT8: /* 0xe1 */
@@ -7121,7 +6986,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_LIT8: /* 0xe2 */
@@ -7160,7 +7024,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E3: /* 0xe3 */
@@ -7169,7 +7032,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -7178,7 +7040,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -7187,7 +7048,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -7196,7 +7056,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -7205,7 +7064,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -7323,7 +7181,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_THROW_VERIFICATION_ERROR: /* 0xed */
@@ -7341,7 +7198,6 @@
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -7420,7 +7276,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -7439,26 +7294,24 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_QUICK: /* 0xf3 */
/* File: armv6t2/OP_IGET_WIDE_QUICK.S */
/* iget-wide-quick vA, vB, offset@CCCC */
mov r2, rINST, lsr #12 @ r2<- B
- FETCH(r1, 1) @ r1<- field byte offset
+ FETCH(ip, 1) @ ip<- field byte offset
GET_VREG(r3, r2) @ r3<- object we're operating on
ubfx r2, rINST, #8, #4 @ r2<- A
cmp r3, #0 @ check object for null
beq common_errNullObject @ object was null
- ldrd r0, [r3, r1] @ r0<- obj.field (64 bits, aligned)
+ ldrd r0, [r3, ip] @ r0<- obj.field (64 bits, aligned)
FETCH_ADVANCE_INST(2) @ advance rPC, load rINST
add r3, rFP, r2, lsl #2 @ r3<- &fp[A]
GET_INST_OPCODE(ip) @ extract opcode from rINST
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -7480,7 +7333,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_QUICK: /* 0xf5 */
@@ -7499,7 +7351,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -7518,7 +7369,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -7540,7 +7390,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -7620,7 +7469,6 @@
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethodNoRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -7650,7 +7498,6 @@
bl common_invokeMethodRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -7659,7 +7506,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -7668,7 +7514,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -7677,7 +7522,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -7687,7 +7531,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -7723,7 +7566,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_STRING_JUMBO */
/*
@@ -7743,7 +7585,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_CLASS */
/*
@@ -7764,7 +7605,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CHECK_CAST */
/*
@@ -7809,7 +7649,6 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
/* continuation for OP_INSTANCE_OF */
/*
@@ -7865,7 +7704,6 @@
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .LOP_INSTANCE_OF_resolved @ pick up where we left off
-
/* continuation for OP_NEW_INSTANCE */
.balign 32 @ minimize cache lines
@@ -7908,7 +7746,6 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
/* continuation for OP_NEW_ARRAY */
@@ -7948,7 +7785,6 @@
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
/*
@@ -8027,7 +7863,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
/*
@@ -8106,31 +7941,26 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_CMPL_FLOAT */
.LOP_CMPL_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_FLOAT */
.LOP_CMPG_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPL_DOUBLE */
.LOP_CMPL_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_DOUBLE */
.LOP_CMPG_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMP_LONG */
.LOP_CMP_LONG_less:
@@ -8152,7 +7982,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_AGET_WIDE */
.LOP_AGET_WIDE_finish:
@@ -8163,7 +7992,6 @@
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -8173,7 +8001,6 @@
strd r2, [r0, #offArrayObject_contents] @ r2/r3<- vBB[vCC]
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_OBJECT */
/*
* On entry:
@@ -8195,7 +8022,6 @@
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET */
/*
@@ -8215,7 +8041,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE */
/*
@@ -8235,7 +8060,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_OBJECT */
/*
@@ -8256,7 +8080,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BOOLEAN */
/*
@@ -8277,7 +8100,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BYTE */
/*
@@ -8298,7 +8120,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_CHAR */
/*
@@ -8319,7 +8140,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_SHORT */
/*
@@ -8340,7 +8160,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT */
/*
@@ -8360,7 +8179,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE */
/*
@@ -8380,7 +8198,6 @@
strd r0, [r9, r3] @ obj.field (64 bits, aligned)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_OBJECT */
/*
@@ -8401,7 +8218,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BOOLEAN */
/*
@@ -8422,7 +8238,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BYTE */
/*
@@ -8443,7 +8258,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_CHAR */
/*
@@ -8464,7 +8278,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_SHORT */
/*
@@ -8485,7 +8298,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SGET */
/*
@@ -8501,7 +8313,6 @@
bne .LOP_SGET_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -8519,7 +8330,6 @@
bne .LOP_SGET_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -8535,7 +8345,6 @@
bne .LOP_SGET_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -8551,7 +8360,6 @@
bne .LOP_SGET_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -8567,7 +8375,6 @@
bne .LOP_SGET_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -8583,7 +8390,6 @@
bne .LOP_SGET_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -8599,7 +8405,6 @@
bne .LOP_SGET_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -8615,7 +8420,6 @@
bne .LOP_SPUT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -8635,7 +8439,6 @@
bne .LOP_SPUT_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -8651,7 +8454,6 @@
bne .LOP_SPUT_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -8667,7 +8469,6 @@
bne .LOP_SPUT_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -8683,7 +8484,6 @@
bne .LOP_SPUT_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -8699,7 +8499,6 @@
bne .LOP_SPUT_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -8715,7 +8514,6 @@
bne .LOP_SPUT_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
/*
@@ -8733,7 +8531,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodNoRange @ continue on
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -8768,7 +8565,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -8786,7 +8582,6 @@
bne .LOP_INVOKE_DIRECT_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
/*
@@ -8804,7 +8599,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodRange @ continue on
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -8839,7 +8633,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -8857,7 +8650,6 @@
bne .LOP_INVOKE_DIRECT_RANGE_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_FLOAT_TO_LONG */
/*
* Convert the float in r0 to a long in r0/r1.
@@ -8895,7 +8687,6 @@
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
/* continuation for OP_DOUBLE_TO_LONG */
/*
* Convert the double in r0/r1 to a long in r0/r1.
@@ -8946,7 +8737,6 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
/* continuation for OP_MUL_LONG */
.LOP_MUL_LONG_finish:
@@ -8954,7 +8744,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -8963,7 +8752,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG */
.LOP_SHR_LONG_finish:
@@ -8972,7 +8760,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG */
.LOP_USHR_LONG_finish:
@@ -8981,7 +8768,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG_2ADDR */
.LOP_SHL_LONG_2ADDR_finish:
@@ -8989,7 +8775,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG_2ADDR */
.LOP_SHR_LONG_2ADDR_finish:
@@ -8997,7 +8782,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG_2ADDR */
.LOP_USHR_LONG_2ADDR_finish:
@@ -9005,7 +8789,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE_VOLATILE */
/*
@@ -9031,7 +8814,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE_VOLATILE */
/*
@@ -9057,7 +8839,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_SGET_WIDE_VOLATILE */
/*
@@ -9075,7 +8856,6 @@
bne .LOP_SGET_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE_VOLATILE */
/*
@@ -9095,7 +8875,6 @@
bne .LOP_SPUT_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_EXECUTE_INLINE */
/*
@@ -9131,7 +8910,6 @@
.LOP_EXECUTE_INLINE_table:
.word gDvmInlineOpsTable
-
/* continuation for OP_EXECUTE_INLINE_RANGE */
/*
@@ -9161,7 +8939,6 @@
.LOP_EXECUTE_INLINE_RANGE_table:
.word gDvmInlineOpsTable
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -10393,4 +10170,3 @@
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S
index 1423b22..5174fc1 100644
--- a/vm/mterp/out/InterpAsm-armv7-a.S
+++ b/vm/mterp/out/InterpAsm-armv7-a.S
@@ -242,7 +242,6 @@
ldmfd sp!, {\regs,pc}
.endm
-
/* File: armv5te/entry.S */
/*
* Copyright (C) 2008 The Android Open Source Project
@@ -396,7 +395,6 @@
.word .LstrBadEntryPoint
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -420,7 +418,6 @@
.fnend
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -435,7 +432,6 @@
SET_VREG(r2, r0) @ fp[A]<- r2
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_FROM16: /* 0x02 */
@@ -450,7 +446,6 @@
SET_VREG(r2, r0) @ fp[AA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -465,7 +460,6 @@
SET_VREG(r2, r0) @ fp[AAAA]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE: /* 0x04 */
@@ -482,7 +476,6 @@
stmia r2, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_FROM16: /* 0x05 */
@@ -499,7 +492,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -516,7 +508,6 @@
stmia r2, {r0-r1} @ fp[AAAA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT: /* 0x07 */
@@ -534,7 +525,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_FROM16: /* 0x08 */
@@ -551,7 +541,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -568,7 +557,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT: /* 0x0a */
@@ -582,7 +570,6 @@
SET_VREG(r0, r2) @ fp[AA]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_WIDE: /* 0x0b */
@@ -597,7 +584,6 @@
stmia r2, {r0-r1} @ fp[AA]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_RESULT_OBJECT: /* 0x0c */
@@ -613,7 +599,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_EXCEPTION: /* 0x0d */
@@ -629,14 +614,12 @@
str r1, [r0, #offThread_exception] @ dvmClearException bypass
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
/* File: armv5te/OP_RETURN_VOID.S */
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -653,7 +636,6 @@
str r0, [rGLUE, #offGlue_retval] @ retval.i <- vAA
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -670,7 +652,6 @@
stmia r3, {r0-r1} @ retval<- r0/r1
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_OBJECT: /* 0x11 */
@@ -689,7 +670,6 @@
b common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -703,7 +683,6 @@
SET_VREG(r1, r0) @ fp[A]<- r1
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -716,7 +695,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST: /* 0x14 */
@@ -731,7 +709,6 @@
SET_VREG(r0, r3) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_HIGH16: /* 0x15 */
@@ -745,7 +722,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_16: /* 0x16 */
@@ -760,7 +736,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_32: /* 0x17 */
@@ -777,7 +752,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE: /* 0x18 */
@@ -796,7 +770,6 @@
stmia r9, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -812,7 +785,6 @@
stmia r3, {r0-r1} @ vAA<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -891,7 +863,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -920,7 +891,6 @@
FETCH_ADVANCE_INST(1) @ advance before throw
b common_errNullObject
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -995,7 +965,6 @@
SET_VREG(r3, r2) @ vB<- length
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_NEW_INSTANCE: /* 0x22 */
@@ -1138,7 +1107,6 @@
str r1, [r0, #offThread_exception] @ thread->exception<- obj
b common_exceptionThrown
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -1194,7 +1162,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_32: /* 0x2a */
@@ -1267,7 +1234,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_SPARSE_SWITCH: /* 0x2c */
@@ -1307,7 +1273,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_CMPL_FLOAT: /* 0x2d */
@@ -1540,7 +1505,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NE: /* 0x33 */
@@ -1576,7 +1540,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LT: /* 0x34 */
@@ -1612,7 +1575,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GE: /* 0x35 */
@@ -1648,7 +1610,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GT: /* 0x36 */
@@ -1684,7 +1645,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LE: /* 0x37 */
@@ -1720,7 +1680,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_EQZ: /* 0x38 */
@@ -1757,7 +1716,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1794,7 +1752,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1831,7 +1788,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1868,7 +1824,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1905,7 +1860,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1942,7 +1896,6 @@
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1951,7 +1904,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -1960,7 +1912,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -1969,7 +1920,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -1978,7 +1928,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -1987,7 +1936,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -1996,7 +1944,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -2027,7 +1974,6 @@
SET_VREG(r2, r9) @ vAA<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -2087,7 +2033,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -2120,7 +2065,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -2153,7 +2097,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -2186,7 +2129,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -2219,7 +2161,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -2250,7 +2191,6 @@
str r2, [r0, #offArrayObject_contents] @ vBB[vCC]<- r2
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -2338,7 +2278,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -2371,7 +2310,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -2404,7 +2342,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -2437,7 +2374,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3305,7 +3241,6 @@
bne common_invokeMethodNoRange @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE: /* 0x72 */
@@ -3334,7 +3269,6 @@
beq common_exceptionThrown @ yes, handle exception
b common_invokeMethodNoRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_73: /* 0x73 */
@@ -3343,7 +3277,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -3470,7 +3403,6 @@
b common_exceptionThrown @ yes, handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
@@ -3501,7 +3433,6 @@
b common_invokeMethodRange @ jump to common handler
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_79: /* 0x79 */
@@ -3510,7 +3441,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -3519,7 +3449,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -3599,7 +3528,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -3627,7 +3555,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -3681,7 +3608,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -3776,7 +3702,6 @@
GOTO_OPCODE(ip) @ execute next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_LONG_TO_FLOAT: /* 0x85 */
@@ -3833,7 +3758,6 @@
/* 10-11 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -3966,7 +3890,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_DOUBLE_TO_FLOAT: /* 0x8c */
@@ -4111,7 +4034,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -4153,7 +4075,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -4196,7 +4117,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT: /* 0x93 */
@@ -4238,7 +4158,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -4281,7 +4200,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT: /* 0x95 */
@@ -4323,7 +4241,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -4365,7 +4282,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -4407,7 +4323,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4449,7 +4364,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT: /* 0x99 */
@@ -4491,7 +4405,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT: /* 0x9a */
@@ -4533,7 +4446,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG: /* 0x9b */
@@ -4578,7 +4490,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG: /* 0x9c */
@@ -4623,7 +4534,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG: /* 0x9d */
@@ -4707,7 +4617,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG: /* 0x9f */
@@ -4753,7 +4662,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG: /* 0xa0 */
@@ -4798,7 +4706,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG: /* 0xa1 */
@@ -4843,7 +4750,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG: /* 0xa2 */
@@ -4888,7 +4794,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG: /* 0xa3 */
@@ -5138,7 +5043,6 @@
/* 11-14 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -5304,7 +5208,6 @@
/* 14-17 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_2ADDR: /* 0xb0 */
@@ -5343,7 +5246,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -5382,7 +5284,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -5422,7 +5323,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_2ADDR: /* 0xb3 */
@@ -5461,7 +5361,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -5501,7 +5400,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -5540,7 +5438,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -5579,7 +5476,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -5618,7 +5514,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -5657,7 +5552,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -5696,7 +5590,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -5735,7 +5628,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -5776,7 +5668,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_LONG_2ADDR: /* 0xbc */
@@ -5817,7 +5708,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_LONG_2ADDR: /* 0xbd */
@@ -5847,7 +5737,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_LONG_2ADDR: /* 0xbe */
@@ -5888,7 +5777,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_LONG_2ADDR: /* 0xbf */
@@ -5930,7 +5818,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_LONG_2ADDR: /* 0xc0 */
@@ -5971,7 +5858,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_LONG_2ADDR: /* 0xc1 */
@@ -6012,7 +5898,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_LONG_2ADDR: /* 0xc2 */
@@ -6053,7 +5938,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_LONG_2ADDR: /* 0xc3 */
@@ -6280,7 +6164,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -6438,7 +6321,6 @@
/* 12-15 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT16: /* 0xd0 */
@@ -6474,7 +6356,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT: /* 0xd1 */
@@ -6511,7 +6392,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT16: /* 0xd2 */
@@ -6548,7 +6428,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT16: /* 0xd3 */
@@ -6584,7 +6463,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT16: /* 0xd4 */
@@ -6621,7 +6499,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT16: /* 0xd5 */
@@ -6657,7 +6534,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT16: /* 0xd6 */
@@ -6693,7 +6569,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -6729,7 +6604,6 @@
/* 10-13 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT_LIT8: /* 0xd8 */
@@ -6768,7 +6642,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_RSUB_INT_LIT8: /* 0xd9 */
@@ -6807,7 +6680,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -6847,7 +6719,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -6886,7 +6757,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_LIT8: /* 0xdc */
@@ -6926,7 +6796,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_LIT8: /* 0xdd */
@@ -6965,7 +6834,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_LIT8: /* 0xde */
@@ -7004,7 +6872,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -7043,7 +6910,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_LIT8: /* 0xe0 */
@@ -7082,7 +6948,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_LIT8: /* 0xe1 */
@@ -7121,7 +6986,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_LIT8: /* 0xe2 */
@@ -7160,7 +7024,6 @@
/* 10-12 instructions */
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E3: /* 0xe3 */
@@ -7169,7 +7032,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -7178,7 +7040,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -7187,7 +7048,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -7196,7 +7056,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -7205,7 +7064,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -7323,7 +7181,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_THROW_VERIFICATION_ERROR: /* 0xed */
@@ -7341,7 +7198,6 @@
bl dvmThrowVerificationError @ always throws
b common_exceptionThrown @ handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -7420,7 +7276,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -7439,7 +7294,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_QUICK: /* 0xf3 */
@@ -7458,7 +7312,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -7480,7 +7333,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_QUICK: /* 0xf5 */
@@ -7499,7 +7351,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -7518,7 +7369,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -7540,7 +7390,6 @@
GOTO_OPCODE(ip) @ jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -7620,7 +7469,6 @@
beq common_errNullObject @ "this" is null, throw exception
bl common_invokeMethodNoRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -7650,7 +7498,6 @@
bl common_invokeMethodRange @ continue on
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -7659,7 +7506,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -7668,7 +7514,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -7677,7 +7522,6 @@
bl common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -7687,7 +7531,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -7723,7 +7566,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_STRING_JUMBO */
/*
@@ -7743,7 +7585,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CONST_CLASS */
/*
@@ -7764,7 +7605,6 @@
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CHECK_CAST */
/*
@@ -7809,7 +7649,6 @@
.LstrClassCastExceptionPtr:
.word .LstrClassCastException
-
/* continuation for OP_INSTANCE_OF */
/*
@@ -7865,7 +7704,6 @@
ldr r0, [r0, #offObject_clazz] @ r0<- obj->clazz
b .LOP_INSTANCE_OF_resolved @ pick up where we left off
-
/* continuation for OP_NEW_INSTANCE */
.balign 32 @ minimize cache lines
@@ -7908,7 +7746,6 @@
.LstrInstantiationErrorPtr:
.word .LstrInstantiationError
-
/* continuation for OP_NEW_ARRAY */
@@ -7948,7 +7785,6 @@
SET_VREG(r0, r2) @ vA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
/*
@@ -8027,7 +7863,6 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
/*
@@ -8106,31 +7941,26 @@
.word .LstrInternalError
.endif
-
/* continuation for OP_CMPL_FLOAT */
.LOP_CMPL_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_FLOAT */
.LOP_CMPG_FLOAT_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPL_DOUBLE */
.LOP_CMPL_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMPG_DOUBLE */
.LOP_CMPG_DOUBLE_finish:
SET_VREG(r0, r9) @ vAA<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_CMP_LONG */
.LOP_CMP_LONG_less:
@@ -8152,7 +7982,6 @@
GET_INST_OPCODE(ip) @ extract opcode from rINST
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_AGET_WIDE */
.LOP_AGET_WIDE_finish:
@@ -8163,7 +7992,6 @@
stmia r9, {r2-r3} @ vAA/vAA+1<- r2/r3
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -8173,7 +8001,6 @@
strd r2, [r0, #offArrayObject_contents] @ r2/r3<- vBB[vCC]
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_APUT_OBJECT */
/*
* On entry:
@@ -8195,7 +8022,6 @@
str r9, [r10, #offArrayObject_contents] @ vBB[vCC]<- vAA
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET */
/*
@@ -8215,7 +8041,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE */
/*
@@ -8235,7 +8060,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_OBJECT */
/*
@@ -8256,7 +8080,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BOOLEAN */
/*
@@ -8277,7 +8100,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_BYTE */
/*
@@ -8298,7 +8120,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_CHAR */
/*
@@ -8319,7 +8140,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_SHORT */
/*
@@ -8340,7 +8160,6 @@
SET_VREG(r0, r2) @ fp[A]<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT */
/*
@@ -8360,7 +8179,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE */
/*
@@ -8380,7 +8198,6 @@
strd r0, [r9, r3] @ obj.field (64 bits, aligned)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_OBJECT */
/*
@@ -8401,7 +8218,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BOOLEAN */
/*
@@ -8422,7 +8238,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_BYTE */
/*
@@ -8443,7 +8258,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_CHAR */
/*
@@ -8464,7 +8278,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_SHORT */
/*
@@ -8485,7 +8298,6 @@
str r0, [r9, r3] @ obj.field (8/16/32 bits)<- r0
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SGET */
/*
@@ -8501,7 +8313,6 @@
bne .LOP_SGET_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -8519,7 +8330,6 @@
bne .LOP_SGET_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -8535,7 +8345,6 @@
bne .LOP_SGET_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -8551,7 +8360,6 @@
bne .LOP_SGET_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -8567,7 +8375,6 @@
bne .LOP_SGET_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -8583,7 +8390,6 @@
bne .LOP_SGET_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -8599,7 +8405,6 @@
bne .LOP_SGET_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -8615,7 +8420,6 @@
bne .LOP_SPUT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -8635,7 +8439,6 @@
bne .LOP_SPUT_WIDE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -8651,7 +8454,6 @@
bne .LOP_SPUT_OBJECT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -8667,7 +8469,6 @@
bne .LOP_SPUT_BOOLEAN_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -8683,7 +8484,6 @@
bne .LOP_SPUT_BYTE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -8699,7 +8499,6 @@
bne .LOP_SPUT_CHAR_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -8715,7 +8514,6 @@
bne .LOP_SPUT_SHORT_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
/*
@@ -8733,7 +8531,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodNoRange @ continue on
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -8768,7 +8565,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -8786,7 +8582,6 @@
bne .LOP_INVOKE_DIRECT_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
/*
@@ -8804,7 +8599,6 @@
ldr r0, [r3, r2, lsl #2] @ r3<- vtable[methodIndex]
bl common_invokeMethodRange @ continue on
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -8839,7 +8633,6 @@
ldr r1, [r0, #offMethod_name] @ r1<- method name
b common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -8857,7 +8650,6 @@
bne .LOP_INVOKE_DIRECT_RANGE_finish @ no, continue
b common_exceptionThrown @ yes, handle exception
-
/* continuation for OP_FLOAT_TO_LONG */
/*
* Convert the float in r0 to a long in r0/r1.
@@ -8895,7 +8687,6 @@
bl __aeabi_f2lz @ convert float to long
ldmfd sp!, {r4, pc}
-
/* continuation for OP_DOUBLE_TO_LONG */
/*
* Convert the double in r0/r1 to a long in r0/r1.
@@ -8946,7 +8737,6 @@
add sp, sp, #4
ldmfd sp!, {r4, r5, pc}
-
/* continuation for OP_MUL_LONG */
.LOP_MUL_LONG_finish:
@@ -8954,7 +8744,6 @@
stmia r0, {r9-r10} @ vAA/vAA+1<- r9/r10
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -8963,7 +8752,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG */
.LOP_SHR_LONG_finish:
@@ -8972,7 +8760,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG */
.LOP_USHR_LONG_finish:
@@ -8981,7 +8768,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHL_LONG_2ADDR */
.LOP_SHL_LONG_2ADDR_finish:
@@ -8989,7 +8775,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_SHR_LONG_2ADDR */
.LOP_SHR_LONG_2ADDR_finish:
@@ -8997,7 +8782,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_USHR_LONG_2ADDR */
.LOP_USHR_LONG_2ADDR_finish:
@@ -9005,7 +8789,6 @@
stmia r9, {r0-r1} @ vAA/vAA+1<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IGET_WIDE_VOLATILE */
/*
@@ -9031,7 +8814,6 @@
stmia r3, {r0-r1} @ fp[A]<- r0/r1
GOTO_OPCODE(ip) @ jump to next instruction
-
/* continuation for OP_IPUT_WIDE_VOLATILE */
/*
@@ -9057,7 +8839,6 @@
.endif
GOTO_OPCODE(r10) @ jump to next instruction
-
/* continuation for OP_SGET_WIDE_VOLATILE */
/*
@@ -9075,7 +8856,6 @@
bne .LOP_SGET_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_SPUT_WIDE_VOLATILE */
/*
@@ -9095,7 +8875,6 @@
bne .LOP_SPUT_WIDE_VOLATILE_finish @ yes, finish
b common_exceptionThrown @ no, handle exception
-
/* continuation for OP_EXECUTE_INLINE */
/*
@@ -9131,7 +8910,6 @@
.LOP_EXECUTE_INLINE_table:
.word gDvmInlineOpsTable
-
/* continuation for OP_EXECUTE_INLINE_RANGE */
/*
@@ -9161,7 +8939,6 @@
.LOP_EXECUTE_INLINE_RANGE_table:
.word gDvmInlineOpsTable
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -10393,4 +10170,3 @@
.LstrPrintLong:
.asciz "<%lld>"
-
diff --git a/vm/mterp/out/InterpAsm-x86-atom.S b/vm/mterp/out/InterpAsm-x86-atom.S
index 6eb1a45..8f8cb0f 100644
--- a/vm/mterp/out/InterpAsm-x86-atom.S
+++ b/vm/mterp/out/InterpAsm-x86-atom.S
@@ -528,7 +528,6 @@
MTERP_ENTRY
#endif
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE: /* 0x01 */
@@ -732,7 +731,6 @@
movq %xmm0, (rFP, rINST, 4) # vA<- vB
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_WIDE_16: /* 0x06 */
@@ -1153,7 +1151,6 @@
SET_VREG %edx, rINST # vAA<- glue->self->exception
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_VOID: /* 0x0e */
@@ -1179,7 +1176,6 @@
jmp common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -1240,8 +1236,6 @@
jmp common_returnFromMethod # jump to common return code
-
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN_WIDE: /* 0x10 */
@@ -1341,7 +1335,6 @@
jmp common_returnFromMethod # jump to common return code
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_4: /* 0x12 */
@@ -1875,7 +1868,6 @@
#endif
FGETOP_JMP 1, %edx # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_MONITOR_EXIT: /* 0x1e */
@@ -1927,7 +1919,6 @@
je common_exceptionThrown # handle exception
FINISH_JMP %edx # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_CHECK_CAST: /* 0x1f */
@@ -2419,7 +2410,6 @@
movl rINST, offThread_exception(%ecx) # thread->exception<- object
jmp common_exceptionThrown # handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO: /* 0x28 */
@@ -2461,7 +2451,6 @@
js common_periodicChecks2 # do check on backwards branch
FINISH_RB %edx, %ecx # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_GOTO_16: /* 0x29 */
@@ -2543,7 +2532,6 @@
jc common_periodicChecks2 # do check on backwards branch
FINISH_RB %edx, %ecx # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_PACKED_SWITCH: /* 0x2b */
@@ -3975,7 +3963,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3F: /* 0x3f */
@@ -4032,7 +4019,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_40: /* 0x40 */
@@ -4089,7 +4075,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_41: /* 0x41 */
@@ -4146,7 +4131,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_42: /* 0x42 */
@@ -4203,7 +4187,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_43: /* 0x43 */
@@ -4260,7 +4243,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_AGET: /* 0x44 */
@@ -5876,8 +5858,6 @@
jmp .LOP_IPUT_OBJECT_finish
-
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_BOOLEAN: /* 0x5c */
@@ -6328,8 +6308,6 @@
jmp .LOP_SGET_OBJECT_finish
-
-
/* ------------------------------ */
.balign 64
.L_OP_SGET_BOOLEAN: /* 0x63 */
@@ -6395,7 +6373,6 @@
jmp .LOP_SGET_BOOLEAN_finish
-
/* ------------------------------ */
.balign 64
.L_OP_SGET_BYTE: /* 0x64 */
@@ -7377,7 +7354,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
@@ -7851,7 +7827,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_7A: /* 0x7a */
@@ -7908,7 +7883,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_INT: /* 0x7b */
@@ -8111,9 +8085,6 @@
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_NOT_LONG: /* 0x7e */
@@ -8182,8 +8153,6 @@
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
-
/* ------------------------------ */
.balign 64
.L_OP_NEG_FLOAT: /* 0x7f */
@@ -8319,9 +8288,6 @@
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_LONG: /* 0x81 */
@@ -8408,7 +8374,6 @@
movss %xmm0, (rFP, rINST, 4) # vA<- %xmm0
FINISH 1 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_INT_TO_DOUBLE: /* 0x83 */
@@ -8598,7 +8563,6 @@
fstpl (rFP, %ecx, 4) # vA<- FPU; (double) vB
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_FLOAT_TO_INT: /* 0x87 */
@@ -9066,7 +9030,6 @@
SET_VREG %ecx, rINST # vA<- result
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_INT: /* 0x90 */
@@ -9135,8 +9098,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -9205,9 +9166,6 @@
OLD_JMP_4 %eax
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -9330,7 +9288,6 @@
.endif
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT: /* 0x94 */
@@ -9480,9 +9437,6 @@
OLD_JMP_4 %eax
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -9551,8 +9505,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -9621,8 +9573,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -10468,7 +10418,6 @@
movsd %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 2 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_FLOAT: /* 0xa6 */
@@ -10751,7 +10700,6 @@
fstps (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 2 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE: /* 0xab */
@@ -10989,7 +10937,6 @@
FFETCH_ADV 2, %eax # %eax<- next instruction hi; fetch, advance
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE: /* 0xaf */
@@ -11108,8 +11055,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT_2ADDR: /* 0xb1 */
@@ -11180,8 +11125,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_2ADDR: /* 0xb2 */
@@ -11300,7 +11243,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_REM_INT_2ADDR: /* 0xb4 */
@@ -11385,7 +11327,6 @@
-
/* ------------------------------ */
.balign 64
.L_OP_AND_INT_2ADDR: /* 0xb5 */
@@ -11456,8 +11397,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT_2ADDR: /* 0xb6 */
@@ -11528,8 +11467,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_2ADDR: /* 0xb7 */
@@ -11600,8 +11537,6 @@
OLD_JMP_4 %eax
-
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT_2ADDR: /* 0xb8 */
@@ -12385,7 +12320,6 @@
movq %xmm1, (rFP, rINST, 4) # vA<- shifted vA
FINISH 1 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_LONG_2ADDR: /* 0xc4 */
@@ -12479,7 +12413,6 @@
movq %xmm1, (rFP, rINST, 4) # vA<- shifted vA
FINISH 1 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
@@ -12769,9 +12702,6 @@
fstps (rFP, rINST, 4)
FINISH 1 # jump to next instruction
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
@@ -13018,7 +12948,6 @@
fstpl (rFP, %edx, 4) # vAA<- result
FINISH 1 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE_2ADDR: /* 0xcf */
@@ -13729,7 +13658,6 @@
SET_VREG %edx, rINST # vAA<- %edx; result
FINISH 2 # jump to next instruction
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT_LIT8: /* 0xda */
@@ -14407,7 +14335,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E4: /* 0xe4 */
@@ -14464,7 +14391,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E5: /* 0xe5 */
@@ -14521,7 +14447,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E6: /* 0xe6 */
@@ -14578,7 +14503,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_E7: /* 0xe7 */
@@ -14635,7 +14559,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
@@ -14978,7 +14901,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_QUICK: /* 0xf2 */
@@ -15065,8 +14987,6 @@
movq %xmm0, (rFP, rINST, 4) # fp[A]<- %xmm0
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
/* ------------------------------ */
.balign 64
.L_OP_IGET_OBJECT_QUICK: /* 0xf4 */
@@ -15173,8 +15093,6 @@
movl rINST, (%eax, %ecx) # object field<- vA
FGETOP_JMP 2, %edx # jump to next instruction; getop, jmp
-
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_WIDE_QUICK: /* 0xf6 */
@@ -15218,7 +15136,6 @@
movq %xmm0, (%edx, %ecx) # object field<- %xmm0; fp[A]
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* ------------------------------ */
.balign 64
.L_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
@@ -15282,8 +15199,6 @@
FGETOP_JMP 2, %edx # jump to next instruction; getop, jmp
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
@@ -15326,8 +15241,6 @@
movl (%edx, %ecx, 4), %ecx # %ecx<- vtable[methodIndex]
jmp common_invokeMethodNoRange # invoke method common code
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
@@ -15391,8 +15304,6 @@
jmp common_invokeMethodRange # invoke method common code
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK: /* 0xfa */
@@ -15437,9 +15348,6 @@
je common_errNullObject # handle null object
jmp common_invokeMethodNoRange # invoke method common code
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -15505,9 +15413,6 @@
jmp common_invokeMethodRange # invoke method common code
-
-
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -15564,7 +15469,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FD: /* 0xfd */
@@ -15621,7 +15525,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FE: /* 0xfe */
@@ -15678,7 +15581,6 @@
call common_abort
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FF: /* 0xff */
@@ -15736,7 +15638,6 @@
-
.balign 64
.size dvmAsmInstructionStart, .-dvmAsmInstructionStart
.global dvmAsmInstructionEnd
@@ -16112,7 +16013,6 @@
SET_VREG %eax, rINST # vA<- pArray
FINISH 2 # jump to next instruction
-
/* continuation for OP_FILLED_NEW_ARRAY */
.LOP_FILLED_NEW_ARRAY_break:
@@ -16325,12 +16225,10 @@
.LOP_PACKED_SWITCH_finish:
FINISH_RB %edx, %ecx # jump to next instruction
-
/* continuation for OP_SPARSE_SWITCH */
.LOP_SPARSE_SWITCH_finish:
FINISH_RB %edx, %ecx # jump to next instruction
-
/* continuation for OP_CMPL_FLOAT */
.LOP_CMPL_FLOAT_greater:
movl $0x1, (rFP, rINST, 4) # vAA<- greater than
@@ -16397,8 +16295,6 @@
movl $0x1, (rFP, rINST, 4) # vAA<- greater than
FINISH 2 # jump to next instruction
-
-
/* continuation for OP_APUT_OBJECT */
.LOP_APUT_OBJECT_finish:
@@ -16478,8 +16374,6 @@
movq %xmm0, (rFP, rINST, 4) # vA<- %xmm0; object field
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
/* continuation for OP_IGET_OBJECT */
.LOP_IGET_OBJECT_finish:
@@ -16644,7 +16538,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_IPUT_WIDE */
.LOP_IPUT_WIDE_finish2:
@@ -16675,8 +16568,6 @@
movq %xmm0, (%ecx, %edx) # object field<- %xmm0; vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
/* continuation for OP_IPUT_OBJECT */
.LOP_IPUT_OBJECT_finish:
@@ -16706,7 +16597,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_IPUT_BOOLEAN */
.LOP_IPUT_BOOLEAN_finish:
@@ -16736,7 +16626,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_IPUT_BYTE */
.LOP_IPUT_BYTE_finish:
@@ -16766,7 +16655,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_IPUT_CHAR */
.LOP_IPUT_CHAR_finish:
@@ -16796,7 +16684,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_IPUT_SHORT */
.LOP_IPUT_SHORT_finish:
@@ -16826,7 +16713,6 @@
movl rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
/* continuation for OP_SGET */
.LOP_SGET_resolve:
@@ -17171,7 +17057,6 @@
movl (%edx, %eax, 4), %ecx # %ecx<- vtable[methodIndex]
jmp common_invokeMethodNoRange # invoke method common code
-
/* continuation for OP_INVOKE_SUPER */
.LOP_INVOKE_SUPER_continue2:
@@ -17222,7 +17107,6 @@
movl offMethod_name(%ecx), %edx # %edx<- method name
jmp common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT */
/*
@@ -17268,8 +17152,6 @@
movl %eax, %ecx # %ecx<- method
jmp common_invokeMethodNoRange # invoke method common code
-
-
/* continuation for OP_INVOKE_INTERFACE */
.LOP_INVOKE_INTERFACE_break:
movl rGLUE, %ecx # %ecx<- pMterpGlue
@@ -17323,7 +17205,6 @@
movl (%edx, %eax, 4), %ecx # %ecx<- vtable[methodIndex]
jmp common_invokeMethodRange # invoke method common code
-
/* continuation for OP_INVOKE_SUPER_RANGE */
.LOP_INVOKE_SUPER_RANGE_continue2:
@@ -17374,7 +17255,6 @@
movl offMethod_name(%ecx), %edx # %edx<- method name
jmp common_errNoSuchMethod
-
/* continuation for OP_INVOKE_DIRECT_RANGE */
/*
@@ -17420,8 +17300,6 @@
movl %eax, %ecx # %ecx<- method
jmp common_invokeMethodRange # invoke method common code
-
-
/* continuation for OP_INVOKE_INTERFACE_RANGE */
.LOP_INVOKE_INTERFACE_RANGE_break:
movl rGLUE, %ecx # %ecx<- pMterpGlue
@@ -17498,8 +17376,6 @@
movq %xmm0, (rFP, %edx, 4) # vA<- %xmm0; negInf
FINISH 1 # jump to next instruction
-
-
/* continuation for OP_DOUBLE_TO_INT */
.LOP_DOUBLE_TO_INT_break:
@@ -17528,7 +17404,6 @@
movl $0x80000000, (rFP, %edx, 4) # vA<- negInf
FINISH 1 # jump to next instruction
-
/* continuation for OP_DOUBLE_TO_LONG */
.LOP_DOUBLE_TO_LONG_break:
@@ -17560,7 +17435,6 @@
movq %xmm0, (rFP, %edx, 4) # vA<- %xmm0; negInf
FINISH 1 # jump to next instruction
-
/* continuation for OP_DIV_INT */
.LOP_DIV_INT_break:
FFETCH_ADV 2 %eax
@@ -17602,7 +17476,6 @@
movl %eax, (rFP, rINST, 4) # vAA<- results lo
FINISH 2 # jump to next instruction
-
/* continuation for OP_DIV_LONG */
.LOP_DIV_LONG_finish:
movq %xmm0, -16(%esp) # push arg vBB,vBB+1
@@ -17636,7 +17509,6 @@
movq %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 2 # jump to next instruction
-
/* continuation for OP_REM_DOUBLE */
.LOP_REM_DOUBLE_break:
@@ -17646,7 +17518,6 @@
fstpl (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 2 # jump to next instruction
-
/* continuation for OP_DIV_INT_2ADDR */
.LOP_DIV_INT_2ADDR_break:
FFETCH_ADV 1, %edx # %ecx<- next instruction hi; fetch, advance
@@ -17657,7 +17528,6 @@
.endif
FGETOP_JMP 1, %edx # jump to next instruction; getop, jmp
-
/* continuation for OP_REM_INT_2ADDR */
.LOP_REM_INT_2ADDR_break:
FFETCH_ADV 1, %edx # %ecx<- next instruction hi; fetch, advance
@@ -17668,7 +17538,6 @@
.endif
FGETOP_JMP 1, %edx # jump to next instruction; getop, jmp
-
/* continuation for OP_MUL_LONG_2ADDR */
/*
@@ -17692,7 +17561,6 @@
movl %eax, (rFP, %edx, 4) # vA<- results lo
FINISH 1 # jump to next instruction
-
/* continuation for OP_DIV_LONG_2ADDR */
.LOP_DIV_LONG_2ADDR_break:
movq %xmm0, -20(%esp) # push arg vA, vA+1
@@ -17726,8 +17594,6 @@
movq %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 1 # jump to next instruction
-
-
/* continuation for OP_REM_DOUBLE_2ADDR */
.LOP_REM_DOUBLE_2ADDR_break:
@@ -17737,14 +17603,6 @@
fstpl (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 1 # jump to next instruction
-
-
-
-
-
-
-
-
/* continuation for OP_DIV_INT_LIT16 */
.LOP_DIV_INT_LIT16_break:
movzbl (rPC), %edx
@@ -17756,7 +17614,6 @@
movzbl 1(rPC), rINST
jmp *dvmAsmInstructionJmpTable(, %edx, 4)
-
/* continuation for OP_REM_INT_LIT16 */
.LOP_REM_INT_LIT16_break:
movzbl (rPC), %edx
@@ -17768,7 +17625,6 @@
movzbl 1(rPC), rINST
jmp *dvmAsmInstructionJmpTable(, %edx, 4)
-
/* continuation for OP_DIV_INT_LIT8 */
.LOP_DIV_INT_LIT8_break:
movzbl (rPC), %edx
diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S
index 66317da..8168c59 100644
--- a/vm/mterp/out/InterpAsm-x86.S
+++ b/vm/mterp/out/InterpAsm-x86.S
@@ -215,7 +215,6 @@
#include "../common/asm-constants.h"
-
.global dvmAsmInstructionStart
.type dvmAsmInstructionStart, %function
dvmAsmInstructionStart = .L_OP_NOP
@@ -258,7 +257,6 @@
SET_VREG (%ecx,%eax) # fp[AA]<- ecx]
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_16: /* 0x03 */
@@ -355,7 +353,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_MOVE_OBJECT_16: /* 0x09 */
@@ -438,7 +435,6 @@
/* File: x86/OP_RETURN_VOID.S */
jmp common_returnFromMethod
-
/* ------------------------------ */
.balign 64
.L_OP_RETURN: /* 0x0f */
@@ -506,7 +502,6 @@
SET_VREG(%eax,%ecx)
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_16: /* 0x13 */
@@ -591,7 +586,6 @@
ADVANCE_PC(5)
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_WIDE_HIGH16: /* 0x19 */
@@ -607,7 +601,6 @@
SET_VREG_WORD(%eax,%ecx,0) # v[AA+0]<- eax
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_CONST_STRING: /* 0x1a */
@@ -1423,7 +1416,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IF_NEZ: /* 0x39 */
@@ -1451,7 +1443,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LTZ: /* 0x3a */
@@ -1479,7 +1470,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GEZ: /* 0x3b */
@@ -1507,7 +1497,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IF_GTZ: /* 0x3c */
@@ -1535,7 +1524,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IF_LEZ: /* 0x3d */
@@ -1563,7 +1551,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_3E: /* 0x3e */
@@ -1638,7 +1625,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_WIDE: /* 0x45 */
@@ -1687,7 +1673,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BOOLEAN: /* 0x47 */
@@ -1716,7 +1701,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_BYTE: /* 0x48 */
@@ -1745,7 +1729,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_CHAR: /* 0x49 */
@@ -1774,7 +1757,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_AGET_SHORT: /* 0x4a */
@@ -1803,7 +1785,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_APUT: /* 0x4b */
@@ -1830,7 +1811,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_WIDE: /* 0x4c */
@@ -1901,7 +1881,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_BYTE: /* 0x4f */
@@ -1930,7 +1909,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_CHAR: /* 0x50 */
@@ -1959,7 +1937,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_APUT_SHORT: /* 0x51 */
@@ -1988,7 +1965,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_IGET: /* 0x52 */
@@ -3114,8 +3090,8 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
-
+
+
negl %eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
@@ -3137,8 +3113,8 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
-
+
+
notl %eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
@@ -3256,7 +3232,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstps (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3276,7 +3252,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstpl (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3314,7 +3290,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstps (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3334,7 +3310,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstpl (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3428,7 +3404,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstpl (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3522,7 +3498,7 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
+
fstps (rFP,%ecx,4) # vA<- %st0
GOTO_NEXT
@@ -3543,8 +3519,8 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
-
+
+
movsbl %al,%eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
@@ -3566,8 +3542,8 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
-
+
+
movzwl %ax,%eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
@@ -3589,8 +3565,8 @@
andb $0xf,%cl # ecx<- A
FETCH_INST_WORD(1)
ADVANCE_PC(1)
-
-
+
+
movswl %ax,%eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
@@ -3622,7 +3598,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_INT: /* 0x91 */
@@ -3649,7 +3624,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_INT: /* 0x92 */
@@ -3750,7 +3724,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_OR_INT: /* 0x96 */
@@ -3777,7 +3750,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT: /* 0x97 */
@@ -3804,7 +3776,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_SHL_INT: /* 0x98 */
@@ -4212,7 +4183,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_FLOAT: /* 0xa7 */
@@ -4235,7 +4205,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_FLOAT: /* 0xa8 */
@@ -4258,7 +4227,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_FLOAT: /* 0xa9 */
@@ -4281,7 +4249,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_REM_FLOAT: /* 0xaa */
@@ -4325,7 +4292,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_SUB_DOUBLE: /* 0xac */
@@ -4348,7 +4314,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_MUL_DOUBLE: /* 0xad */
@@ -4371,7 +4336,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_DOUBLE: /* 0xae */
@@ -4394,7 +4358,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_REM_DOUBLE: /* 0xaf */
@@ -4661,7 +4624,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_SHR_INT_2ADDR: /* 0xb9 */
@@ -4684,7 +4646,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_USHR_INT_2ADDR: /* 0xba */
@@ -4707,7 +4668,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_ADD_LONG_2ADDR: /* 0xbb */
@@ -5408,7 +5368,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT16: /* 0xd7 */
@@ -5508,7 +5467,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_DIV_INT_LIT8: /* 0xdb */
@@ -5615,7 +5573,6 @@
GOTO_NEXT
-
/* ------------------------------ */
.balign 64
.L_OP_XOR_INT_LIT8: /* 0xdf */
@@ -5851,7 +5808,6 @@
UNSPILL(rPC)
jmp common_exceptionThrown # handle exception
-
/* ------------------------------ */
.balign 64
.L_OP_EXECUTE_INLINE: /* 0xee */
@@ -6068,8 +6024,6 @@
movl (%eax,%ecx,4),%eax # eax<- vtable[BBBB]
jmp common_invokeMethodNoRange
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
@@ -6097,8 +6051,6 @@
jmp common_invokeMethodRange
-
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK: /* 0xfa */
@@ -6127,7 +6079,6 @@
movl (%ecx,%eax,4),%eax # eax<- super->vtable[BBBB]
jmp common_invokeMethodNoRange
-
/* ------------------------------ */
.balign 64
.L_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
@@ -6158,7 +6109,6 @@
jmp common_invokeMethodRange
-
/* ------------------------------ */
.balign 64
.L_OP_UNUSED_FC: /* 0xfc */
@@ -6231,7 +6181,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_CONST_STRING_JUMBO */
/* This is the less common path, so we'll redo some work
@@ -6255,7 +6204,6 @@
ADVANCE_PC(3)
GOTO_NEXT
-
/* continuation for OP_CONST_CLASS */
/* This is the less common path, so we'll redo some work
@@ -6280,7 +6228,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_MONITOR_ENTER */
.LOP_MONITOR_ENTER_continue:
@@ -6437,7 +6384,6 @@
movl offObject_clazz(%eax),%eax # eax<- obj->clazz
jmp .LOP_INSTANCE_OF_resolved
-
/* continuation for OP_NEW_INSTANCE */
.LOP_NEW_INSTANCE_initialized: # on entry, ecx<- class
@@ -6506,9 +6452,6 @@
UNSPILL(rPC)
jmp common_exceptionThrown
-
-
-
/* continuation for OP_NEW_ARRAY */
/*
@@ -6555,7 +6498,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_FILLED_NEW_ARRAY */
.LOP_FILLED_NEW_ARRAY_more:
@@ -6660,7 +6602,6 @@
UNSPILL(rPC)
jmp common_exceptionThrown
-
/* continuation for OP_FILLED_NEW_ARRAY_RANGE */
.LOP_FILLED_NEW_ARRAY_RANGE_more:
@@ -6765,7 +6706,6 @@
UNSPILL(rPC)
jmp common_exceptionThrown
-
/* continuation for OP_CMPL_FLOAT */
.LOP_CMPL_FLOAT_isNaN:
@@ -6817,7 +6757,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_APUT_WIDE */
.LOP_APUT_WIDE_finish:
@@ -6830,7 +6769,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_APUT_OBJECT */
/* On entry:
@@ -6860,7 +6798,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET */
@@ -6898,7 +6835,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_WIDE */
@@ -6938,7 +6874,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_OBJECT */
@@ -6976,7 +6911,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_BOOLEAN */
@@ -7014,7 +6948,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_BYTE */
@@ -7052,7 +6985,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_CHAR */
@@ -7090,7 +7022,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IGET_SHORT */
@@ -7128,7 +7059,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_IPUT */
@@ -7404,7 +7334,6 @@
jne .LOP_SGET_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_WIDE */
/*
@@ -7425,7 +7354,6 @@
jne .LOP_SGET_WIDE_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_OBJECT */
/*
@@ -7446,7 +7374,6 @@
jne .LOP_SGET_OBJECT_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_BOOLEAN */
/*
@@ -7467,7 +7394,6 @@
jne .LOP_SGET_BOOLEAN_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_BYTE */
/*
@@ -7488,7 +7414,6 @@
jne .LOP_SGET_BYTE_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_CHAR */
/*
@@ -7509,7 +7434,6 @@
jne .LOP_SGET_CHAR_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SGET_SHORT */
/*
@@ -7530,7 +7454,6 @@
jne .LOP_SGET_SHORT_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT */
/*
@@ -7551,7 +7474,6 @@
jne .LOP_SPUT_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_WIDE */
/*
@@ -7572,7 +7494,6 @@
jne .LOP_SPUT_WIDE_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_OBJECT */
/*
@@ -7593,7 +7514,6 @@
jne .LOP_SPUT_OBJECT_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_BOOLEAN */
/*
@@ -7614,7 +7534,6 @@
jne .LOP_SPUT_BOOLEAN_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_BYTE */
/*
@@ -7635,7 +7554,6 @@
jne .LOP_SPUT_BYTE_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_CHAR */
/*
@@ -7656,7 +7574,6 @@
jne .LOP_SPUT_CHAR_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_SPUT_SHORT */
/*
@@ -7677,7 +7594,6 @@
jne .LOP_SPUT_SHORT_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
/* continuation for OP_INVOKE_VIRTUAL */
@@ -7709,7 +7625,6 @@
movl (%ecx,%eax,4),%eax # eax<- vtable[methodIndex]
jmp common_invokeMethodNoRange
-
/* continuation for OP_INVOKE_SUPER */
/*
@@ -7792,7 +7707,6 @@
jne common_invokeMethodNoRange
jmp common_exceptionThrown
-
/* continuation for OP_INVOKE_INTERFACE */
.LOP_INVOKE_INTERFACE_continue:
@@ -7802,7 +7716,6 @@
je common_exceptionThrown
jmp common_invokeMethodNoRange
-
/* continuation for OP_INVOKE_VIRTUAL_RANGE */
@@ -7834,7 +7747,6 @@
movl (%ecx,%eax,4),%eax # eax<- vtable[methodIndex]
jmp common_invokeMethodRange
-
/* continuation for OP_INVOKE_SUPER_RANGE */
/*
@@ -7917,7 +7829,6 @@
jne common_invokeMethodRange
jmp common_exceptionThrown
-
/* continuation for OP_INVOKE_INTERFACE_RANGE */
.LOP_INVOKE_INTERFACE_RANGE_continue:
@@ -7927,7 +7838,6 @@
je common_exceptionThrown
jmp common_invokeMethodRange
-
/* continuation for OP_FLOAT_TO_INT */
@@ -8097,7 +8007,6 @@
ADVANCE_PC(2)
GOTO_NEXT
-
/* continuation for OP_DIV_LONG */
.LOP_DIV_LONG_continue:
@@ -8130,9 +8039,6 @@
movl $0x80000000,%edx
jmp .LOP_DIV_LONG_finish
-
-
-
/* continuation for OP_REM_LONG */
.LOP_REM_LONG_continue:
@@ -8165,9 +8071,6 @@
movl $0,%edx
jmp .LOP_REM_LONG_finish
-
-
-
/* continuation for OP_SHL_LONG */
.LOP_SHL_LONG_finish:
@@ -8227,7 +8130,6 @@
ADVANCE_PC(1)
GOTO_NEXT
-
/* continuation for OP_DIV_LONG_2ADDR */
.LOP_DIV_LONG_2ADDR_continue:
@@ -8263,7 +8165,6 @@
movl $0x80000000,%edx
jmp .LOP_DIV_LONG_2ADDR_finish
-
/* continuation for OP_REM_LONG_2ADDR */
.LOP_REM_LONG_2ADDR_continue:
@@ -8299,7 +8200,6 @@
movl $0,%edx
jmp .LOP_REM_LONG_2ADDR_finish
-
/* continuation for OP_SHL_LONG_2ADDR */
@@ -8413,7 +8313,6 @@
jmp *gDvmInlineOpsTable(%eax)
# will return to caller of .LOP_EXECUTE_INLINE_continue
-
.size dvmAsmSisterStart, .-dvmAsmSisterStart
.global dvmAsmSisterEnd
dvmAsmSisterEnd:
@@ -9076,4 +8975,3 @@
.LstrFilledNewArrayNotImpl:
.asciz "filled-new-array only implemented for 'int'"
-
diff --git a/vm/mterp/out/InterpC-allstubs.c b/vm/mterp/out/InterpC-allstubs.c
index 7df7729..2a366f6 100644
--- a/vm/mterp/out/InterpC-allstubs.c
+++ b/vm/mterp/out/InterpC-allstubs.c
@@ -1763,7 +1763,6 @@
FINISH(2);
OP_END
-
/* File: c/OP_FILLED_NEW_ARRAY.c */
HANDLE_OPCODE(OP_FILLED_NEW_ARRAY /*vB, {vD, vE, vF, vG, vA}, class@CCCC*/)
GOTO_invoke(filledNewArray, false);
@@ -3131,7 +3130,6 @@
longjmp(*pJmpBuf, ((int)changeInterp)+1);
}
-
/* File: c/gotoTargets.c */
/*
* C footer. This has some common code shared by the various targets.
diff --git a/vm/mterp/out/InterpC-portdbg.c b/vm/mterp/out/InterpC-portdbg.c
index 4edcbf0..2b7f333 100644
--- a/vm/mterp/out/InterpC-portdbg.c
+++ b/vm/mterp/out/InterpC-portdbg.c
@@ -1444,7 +1444,6 @@
#endif
}
-
/* File: portable/entry.c */
/*
* Main interpreter loop.
@@ -2130,7 +2129,6 @@
FINISH(2);
OP_END
-
/* File: c/OP_FILLED_NEW_ARRAY.c */
HANDLE_OPCODE(OP_FILLED_NEW_ARRAY /*vB, {vD, vE, vF, vG, vA}, class@CCCC*/)
GOTO_invoke(filledNewArray, false);
@@ -4437,4 +4435,3 @@
return true;
}
-
diff --git a/vm/mterp/out/InterpC-portstd.c b/vm/mterp/out/InterpC-portstd.c
index 36fdc17..d75dead 100644
--- a/vm/mterp/out/InterpC-portstd.c
+++ b/vm/mterp/out/InterpC-portstd.c
@@ -1868,7 +1868,6 @@
FINISH(2);
OP_END
-
/* File: c/OP_FILLED_NEW_ARRAY.c */
HANDLE_OPCODE(OP_FILLED_NEW_ARRAY /*vB, {vD, vE, vF, vG, vA}, class@CCCC*/)
GOTO_invoke(filledNewArray, false);
@@ -4175,4 +4174,3 @@
return true;
}
-
diff --git a/vm/mterp/portable/debug.c b/vm/mterp/portable/debug.c
index 552785e..94f735a 100644
--- a/vm/mterp/portable/debug.c
+++ b/vm/mterp/portable/debug.c
@@ -250,4 +250,3 @@
}
#endif
}
-
diff --git a/vm/mterp/portable/enddefs.c b/vm/mterp/portable/enddefs.c
index 5ddde3c..af8606e 100644
--- a/vm/mterp/portable/enddefs.c
+++ b/vm/mterp/portable/enddefs.c
@@ -40,4 +40,3 @@
pc - curMethod->insns, fp);
return true;
}
-
diff --git a/vm/mterp/x86-atom/OP_AND_INT.S b/vm/mterp/x86-atom/OP_AND_INT.S
index 84d8eb6..2f84b34 100644
--- a/vm/mterp/x86-atom/OP_AND_INT.S
+++ b/vm/mterp/x86-atom/OP_AND_INT.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/binop.S" {"instr":"andl (rFP, %edx, 4), %ecx"}
-
diff --git a/vm/mterp/x86-atom/OP_CMP_LONG.S b/vm/mterp/x86-atom/OP_CMP_LONG.S
index 2ce2a19..cf021a3 100644
--- a/vm/mterp/x86-atom/OP_CMP_LONG.S
+++ b/vm/mterp/x86-atom/OP_CMP_LONG.S
@@ -53,5 +53,3 @@
.L${opcode}_greater:
movl $$0x1, (rFP, rINST, 4) # vAA<- greater than
FINISH 2 # jump to next instruction
-
-
diff --git a/vm/mterp/x86-atom/OP_DIV_DOUBLE.S b/vm/mterp/x86-atom/OP_DIV_DOUBLE.S
index 3220f36..418a230 100644
--- a/vm/mterp/x86-atom/OP_DIV_DOUBLE.S
+++ b/vm/mterp/x86-atom/OP_DIV_DOUBLE.S
@@ -35,4 +35,3 @@
fstpl (rFP, rINST, 4) # vAA<- result
FFETCH_ADV 2, %eax # %eax<- next instruction hi; fetch, advance
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_DIV_DOUBLE_2ADDR.S b/vm/mterp/x86-atom/OP_DIV_DOUBLE_2ADDR.S
index b3173c7..7003e30 100644
--- a/vm/mterp/x86-atom/OP_DIV_DOUBLE_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_DIV_DOUBLE_2ADDR.S
@@ -35,4 +35,3 @@
fdivl (rFP, rINST, 4) # divide double; vA/vB
fstpl (rFP, %edx, 4) # vAA<- result
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_DIV_INT.S b/vm/mterp/x86-atom/OP_DIV_INT.S
index dd4b514..c7f5b27 100644
--- a/vm/mterp/x86-atom/OP_DIV_INT.S
+++ b/vm/mterp/x86-atom/OP_DIV_INT.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/binopD.S"
-
diff --git a/vm/mterp/x86-atom/OP_DIV_INT_2ADDR.S b/vm/mterp/x86-atom/OP_DIV_INT_2ADDR.S
index 1ec4eb9..762d82f 100644
--- a/vm/mterp/x86-atom/OP_DIV_INT_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_DIV_INT_2ADDR.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/binopD2addr.S"
-
diff --git a/vm/mterp/x86-atom/OP_DOUBLE_TO_INT.S b/vm/mterp/x86-atom/OP_DOUBLE_TO_INT.S
index e5494fa..f377762 100644
--- a/vm/mterp/x86-atom/OP_DOUBLE_TO_INT.S
+++ b/vm/mterp/x86-atom/OP_DOUBLE_TO_INT.S
@@ -66,4 +66,3 @@
fstps (rFP, %edx, 4)
movl $$0x80000000, (rFP, %edx, 4) # vA<- negInf
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_DOUBLE_TO_LONG.S b/vm/mterp/x86-atom/OP_DOUBLE_TO_LONG.S
index c12f159..2ce9bcc 100644
--- a/vm/mterp/x86-atom/OP_DOUBLE_TO_LONG.S
+++ b/vm/mterp/x86-atom/OP_DOUBLE_TO_LONG.S
@@ -69,4 +69,3 @@
fstpl (rFP, %edx, 4) # move converted int
movq %xmm0, (rFP, %edx, 4) # vA<- %xmm0; negInf
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_FLOAT_TO_LONG.S b/vm/mterp/x86-atom/OP_FLOAT_TO_LONG.S
index 2a78424..9a50b78 100644
--- a/vm/mterp/x86-atom/OP_FLOAT_TO_LONG.S
+++ b/vm/mterp/x86-atom/OP_FLOAT_TO_LONG.S
@@ -69,5 +69,3 @@
fstpl (rFP, %edx, 4) # move converted int
movq %xmm0, (rFP, %edx, 4) # vA<- %xmm0; negInf
FINISH 1 # jump to next instruction
-
-
diff --git a/vm/mterp/x86-atom/OP_GOTO.S b/vm/mterp/x86-atom/OP_GOTO.S
index cb70859..12d847e 100644
--- a/vm/mterp/x86-atom/OP_GOTO.S
+++ b/vm/mterp/x86-atom/OP_GOTO.S
@@ -34,4 +34,3 @@
shl $$1, %edx # %edx is shifted for byte offset
js common_periodicChecks2 # do check on backwards branch
FINISH_RB %edx, %ecx # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_GOTO_32.S b/vm/mterp/x86-atom/OP_GOTO_32.S
index 9409400..4c56915 100644
--- a/vm/mterp/x86-atom/OP_GOTO_32.S
+++ b/vm/mterp/x86-atom/OP_GOTO_32.S
@@ -35,4 +35,3 @@
shl $$1, %edx # %edx is doubled to get the byte offset
jc common_periodicChecks2 # do check on backwards branch
FINISH_RB %edx, %ecx # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_IGET_WIDE.S b/vm/mterp/x86-atom/OP_IGET_WIDE.S
index 74973b1..370b0b0 100644
--- a/vm/mterp/x86-atom/OP_IGET_WIDE.S
+++ b/vm/mterp/x86-atom/OP_IGET_WIDE.S
@@ -72,5 +72,3 @@
movq (%ecx, %edx), %xmm0 # %xmm0<- object field
movq %xmm0, (rFP, rINST, 4) # vA<- %xmm0; object field
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
diff --git a/vm/mterp/x86-atom/OP_IGET_WIDE_QUICK.S b/vm/mterp/x86-atom/OP_IGET_WIDE_QUICK.S
index 85f1fbe..08a57f6 100644
--- a/vm/mterp/x86-atom/OP_IGET_WIDE_QUICK.S
+++ b/vm/mterp/x86-atom/OP_IGET_WIDE_QUICK.S
@@ -36,5 +36,3 @@
movq (%ecx, %edx), %xmm0 # %xmm0<- object field
movq %xmm0, (rFP, rINST, 4) # fp[A]<- %xmm0
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
diff --git a/vm/mterp/x86-atom/OP_INT_TO_FLOAT.S b/vm/mterp/x86-atom/OP_INT_TO_FLOAT.S
index 23c70cf..52ce729 100644
--- a/vm/mterp/x86-atom/OP_INT_TO_FLOAT.S
+++ b/vm/mterp/x86-atom/OP_INT_TO_FLOAT.S
@@ -34,4 +34,3 @@
cvtsi2ss (rFP,%eax,4), %xmm0 # %xmm0<- vB
movss %xmm0, (rFP, rINST, 4) # vA<- %xmm0
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_INT_TO_SHORT.S b/vm/mterp/x86-atom/OP_INT_TO_SHORT.S
index da6ca95..f2b0b87 100644
--- a/vm/mterp/x86-atom/OP_INT_TO_SHORT.S
+++ b/vm/mterp/x86-atom/OP_INT_TO_SHORT.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/unop.S" { "preinstr":"sal $16, %ecx", "instr":"sar $16, %ecx" }
-
diff --git a/vm/mterp/x86-atom/OP_INVOKE_STATIC.S b/vm/mterp/x86-atom/OP_INVOKE_STATIC.S
index c9ac5ff..30b6d8c 100644
--- a/vm/mterp/x86-atom/OP_INVOKE_STATIC.S
+++ b/vm/mterp/x86-atom/OP_INVOKE_STATIC.S
@@ -68,5 +68,3 @@
je common_exceptionThrown
movl %eax, %ecx # %ecx<- method
jmp common_invokeMethod${routine} # invoke method common code
-
-
diff --git a/vm/mterp/x86-atom/OP_INVOKE_SUPER.S b/vm/mterp/x86-atom/OP_INVOKE_SUPER.S
index 684a0e9..539bea1 100644
--- a/vm/mterp/x86-atom/OP_INVOKE_SUPER.S
+++ b/vm/mterp/x86-atom/OP_INVOKE_SUPER.S
@@ -103,4 +103,3 @@
.L${opcode}_nsm:
movl offMethod_name(%ecx), %edx # %edx<- method name
jmp common_errNoSuchMethod
-
diff --git a/vm/mterp/x86-atom/OP_INVOKE_SUPER_QUICK.S b/vm/mterp/x86-atom/OP_INVOKE_SUPER_QUICK.S
index 3da7346..55c7e94 100644
--- a/vm/mterp/x86-atom/OP_INVOKE_SUPER_QUICK.S
+++ b/vm/mterp/x86-atom/OP_INVOKE_SUPER_QUICK.S
@@ -38,6 +38,3 @@
movl (%eax, %ecx, 4), %ecx # %ecx<- vtable[methodIndex]
je common_errNullObject # handle null object
jmp common_invokeMethod${routine} # invoke method common code
-
-
-
diff --git a/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL.S b/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL.S
index b88928b..46c9265 100644
--- a/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL.S
+++ b/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL.S
@@ -91,4 +91,3 @@
movl offClassObject_vtable(%edx), %edx # %edx<- thisPtr->clazz->vtable
movl (%edx, %eax, 4), %ecx # %ecx<- vtable[methodIndex]
jmp common_invokeMethod${routine} # invoke method common code
-
diff --git a/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL_QUICK.S b/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL_QUICK.S
index efa5fb2..16a4e40 100644
--- a/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL_QUICK.S
+++ b/vm/mterp/x86-atom/OP_INVOKE_VIRTUAL_QUICK.S
@@ -36,5 +36,3 @@
movl offClassObject_vtable(%edx), %edx # %edx<- thisPtr->clazz->vtable
movl (%edx, %ecx, 4), %ecx # %ecx<- vtable[methodIndex]
jmp common_invokeMethod${routine} # invoke method common code
-
-
diff --git a/vm/mterp/x86-atom/OP_IPUT.S b/vm/mterp/x86-atom/OP_IPUT.S
index eb893f7..4c029be 100644
--- a/vm/mterp/x86-atom/OP_IPUT.S
+++ b/vm/mterp/x86-atom/OP_IPUT.S
@@ -74,4 +74,3 @@
GET_VREG rINST # rINST<- vA
mov$mov rINST, (%edx, %ecx) # object field<- vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_IPUT_OBJECT.S b/vm/mterp/x86-atom/OP_IPUT_OBJECT.S
index 0f9cc32..33727ca 100644
--- a/vm/mterp/x86-atom/OP_IPUT_OBJECT.S
+++ b/vm/mterp/x86-atom/OP_IPUT_OBJECT.S
@@ -18,5 +18,3 @@
*/
%include "x86-atom/OP_IPUT.S"
-
-
diff --git a/vm/mterp/x86-atom/OP_IPUT_QUICK.S b/vm/mterp/x86-atom/OP_IPUT_QUICK.S
index 1c5962d..572291e 100644
--- a/vm/mterp/x86-atom/OP_IPUT_QUICK.S
+++ b/vm/mterp/x86-atom/OP_IPUT_QUICK.S
@@ -35,5 +35,3 @@
GET_VREG rINST # rINST<- vA
movl rINST, (%eax, %ecx) # object field<- vA
FGETOP_JMP 2, %edx # jump to next instruction; getop, jmp
-
-
diff --git a/vm/mterp/x86-atom/OP_IPUT_WIDE.S b/vm/mterp/x86-atom/OP_IPUT_WIDE.S
index 498ebd9..1686219 100644
--- a/vm/mterp/x86-atom/OP_IPUT_WIDE.S
+++ b/vm/mterp/x86-atom/OP_IPUT_WIDE.S
@@ -72,5 +72,3 @@
movq (rFP, rINST, 4), %xmm0 # %xmm0<- vA
movq %xmm0, (%ecx, %edx) # object field<- %xmm0; vA
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
-
diff --git a/vm/mterp/x86-atom/OP_IPUT_WIDE_QUICK.S b/vm/mterp/x86-atom/OP_IPUT_WIDE_QUICK.S
index 5eedbb9..5880231 100644
--- a/vm/mterp/x86-atom/OP_IPUT_WIDE_QUICK.S
+++ b/vm/mterp/x86-atom/OP_IPUT_WIDE_QUICK.S
@@ -36,4 +36,3 @@
movq (rFP, rINST, 4), %xmm0 # %xmm0<- fp[A]
movq %xmm0, (%edx, %ecx) # object field<- %xmm0; fp[A]
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_LONG_TO_DOUBLE.S b/vm/mterp/x86-atom/OP_LONG_TO_DOUBLE.S
index c21014a..5705e25 100644
--- a/vm/mterp/x86-atom/OP_LONG_TO_DOUBLE.S
+++ b/vm/mterp/x86-atom/OP_LONG_TO_DOUBLE.S
@@ -35,4 +35,3 @@
fildll (rFP, rINST, 4) # FPU<- vB
fstpl (rFP, %ecx, 4) # vA<- FPU; (double) vB
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_MONITOR_ENTER.S b/vm/mterp/x86-atom/OP_MONITOR_ENTER.S
index ed33258..d3fada3 100644
--- a/vm/mterp/x86-atom/OP_MONITOR_ENTER.S
+++ b/vm/mterp/x86-atom/OP_MONITOR_ENTER.S
@@ -56,4 +56,3 @@
jne common_exceptionThrown # handle exception
#endif
FGETOP_JMP 1, %edx # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_MONITOR_EXIT.S b/vm/mterp/x86-atom/OP_MONITOR_EXIT.S
index 98f062b..31e1165 100644
--- a/vm/mterp/x86-atom/OP_MONITOR_EXIT.S
+++ b/vm/mterp/x86-atom/OP_MONITOR_EXIT.S
@@ -44,4 +44,3 @@
lea 8(%esp), %esp
je common_exceptionThrown # handle exception
FINISH_JMP %edx # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_MOVE_EXCEPTION.S b/vm/mterp/x86-atom/OP_MOVE_EXCEPTION.S
index b6e37ce..76e700d 100644
--- a/vm/mterp/x86-atom/OP_MOVE_EXCEPTION.S
+++ b/vm/mterp/x86-atom/OP_MOVE_EXCEPTION.S
@@ -36,4 +36,3 @@
movl $$0, offThread_exception(%ecx) # clear exception
SET_VREG %edx, rINST # vAA<- glue->self->exception
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_MOVE_WIDE_FROM16.S b/vm/mterp/x86-atom/OP_MOVE_WIDE_FROM16.S
index c9aa966..4056b34 100644
--- a/vm/mterp/x86-atom/OP_MOVE_WIDE_FROM16.S
+++ b/vm/mterp/x86-atom/OP_MOVE_WIDE_FROM16.S
@@ -32,4 +32,3 @@
movq (rFP, %edx, 4), %xmm0 # %xmm0<- vB
movq %xmm0, (rFP, rINST, 4) # vA<- vB
FGETOP_JMP 2, %eax # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/OP_MUL_LONG.S b/vm/mterp/x86-atom/OP_MUL_LONG.S
index 24b6c29..85cccf2 100644
--- a/vm/mterp/x86-atom/OP_MUL_LONG.S
+++ b/vm/mterp/x86-atom/OP_MUL_LONG.S
@@ -69,4 +69,3 @@
movl %ecx, 4(rFP, rINST, 4) # vAA+1<- results hi
movl %eax, (rFP, rINST, 4) # vAA<- results lo
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_MUL_LONG_2ADDR.S b/vm/mterp/x86-atom/OP_MUL_LONG_2ADDR.S
index 78befcd..d6b8c16 100644
--- a/vm/mterp/x86-atom/OP_MUL_LONG_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_MUL_LONG_2ADDR.S
@@ -70,4 +70,3 @@
movl %ecx, 4(rFP, %edx, 4) # vA+1<- results hi
movl %eax, (rFP, %edx, 4) # vA<- results lo
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_NEG_DOUBLE.S b/vm/mterp/x86-atom/OP_NEG_DOUBLE.S
index e53cdf1..b6fb070 100644
--- a/vm/mterp/x86-atom/OP_NEG_DOUBLE.S
+++ b/vm/mterp/x86-atom/OP_NEG_DOUBLE.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/unopWide.S" { "preinstr":"movq .LdoubNeg, %xmm1", "instr":"pxor %xmm1, %xmm0" }
-
diff --git a/vm/mterp/x86-atom/OP_NEG_LONG.S b/vm/mterp/x86-atom/OP_NEG_LONG.S
index 28f66d0..3f500bb 100644
--- a/vm/mterp/x86-atom/OP_NEG_LONG.S
+++ b/vm/mterp/x86-atom/OP_NEG_LONG.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/unopWide.S" {"preinstr":"xorps %xmm1, %xmm1", "instr":"psubq %xmm0, %xmm1", "result":"%xmm1"}
-
diff --git a/vm/mterp/x86-atom/OP_NEW_ARRAY.S b/vm/mterp/x86-atom/OP_NEW_ARRAY.S
index bb1ef69..a6d5fd3 100644
--- a/vm/mterp/x86-atom/OP_NEW_ARRAY.S
+++ b/vm/mterp/x86-atom/OP_NEW_ARRAY.S
@@ -90,4 +90,3 @@
je common_exceptionThrown # handle exception
SET_VREG %eax, rINST # vA<- pArray
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_NOP.S b/vm/mterp/x86-atom/OP_NOP.S
index 8460045..9911da3 100644
--- a/vm/mterp/x86-atom/OP_NOP.S
+++ b/vm/mterp/x86-atom/OP_NOP.S
@@ -39,4 +39,3 @@
dalvik_inst:
MTERP_ENTRY
#endif
-
diff --git a/vm/mterp/x86-atom/OP_PACKED_SWITCH.S b/vm/mterp/x86-atom/OP_PACKED_SWITCH.S
index 37a40da..7cb6d64 100644
--- a/vm/mterp/x86-atom/OP_PACKED_SWITCH.S
+++ b/vm/mterp/x86-atom/OP_PACKED_SWITCH.S
@@ -50,4 +50,3 @@
%break
.L${opcode}_finish:
FINISH_RB %edx, %ecx # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_REM_DOUBLE.S b/vm/mterp/x86-atom/OP_REM_DOUBLE.S
index d9f15da..aa7d332 100644
--- a/vm/mterp/x86-atom/OP_REM_DOUBLE.S
+++ b/vm/mterp/x86-atom/OP_REM_DOUBLE.S
@@ -49,4 +49,3 @@
lea 16(%esp), %esp
fstpl (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_REM_DOUBLE_2ADDR.S b/vm/mterp/x86-atom/OP_REM_DOUBLE_2ADDR.S
index 6fe7169..434c878 100644
--- a/vm/mterp/x86-atom/OP_REM_DOUBLE_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_REM_DOUBLE_2ADDR.S
@@ -50,11 +50,3 @@
lea 20(%esp), %esp
fstpl (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 1 # jump to next instruction
-
-
-
-
-
-
-
-
diff --git a/vm/mterp/x86-atom/OP_REM_FLOAT.S b/vm/mterp/x86-atom/OP_REM_FLOAT.S
index 733c636..de5e161 100644
--- a/vm/mterp/x86-atom/OP_REM_FLOAT.S
+++ b/vm/mterp/x86-atom/OP_REM_FLOAT.S
@@ -41,4 +41,3 @@
lea 8(%esp), %esp
fstps (rFP, rINST, 4) # vAA<- remainder; return of fmod
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_REM_FLOAT_2ADDR.S b/vm/mterp/x86-atom/OP_REM_FLOAT_2ADDR.S
index d225851..5ff5af5 100644
--- a/vm/mterp/x86-atom/OP_REM_FLOAT_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_REM_FLOAT_2ADDR.S
@@ -42,6 +42,3 @@
lea 8(%esp), %esp
fstps (rFP, rINST, 4)
FINISH 1 # jump to next instruction
-
-
-
diff --git a/vm/mterp/x86-atom/OP_REM_INT_2ADDR.S b/vm/mterp/x86-atom/OP_REM_INT_2ADDR.S
index 534eed7..369ea5c 100644
--- a/vm/mterp/x86-atom/OP_REM_INT_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_REM_INT_2ADDR.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/binopD2addr.S" {"div":"0"}
-
diff --git a/vm/mterp/x86-atom/OP_RETURN.S b/vm/mterp/x86-atom/OP_RETURN.S
index 55af81b..48d7e34 100644
--- a/vm/mterp/x86-atom/OP_RETURN.S
+++ b/vm/mterp/x86-atom/OP_RETURN.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/OP_RETURN_COMMON.S"
-
diff --git a/vm/mterp/x86-atom/OP_RETURN_COMMON.S b/vm/mterp/x86-atom/OP_RETURN_COMMON.S
index cda3fea..d58a16c 100644
--- a/vm/mterp/x86-atom/OP_RETURN_COMMON.S
+++ b/vm/mterp/x86-atom/OP_RETURN_COMMON.S
@@ -32,4 +32,3 @@
GET_VREG rINST # rINST<- vAA
movl rINST, offGlue_retval(%edx) # glue->retval<- vAA
jmp common_returnFromMethod # jump to common return code
-
diff --git a/vm/mterp/x86-atom/OP_RETURN_VOID.S b/vm/mterp/x86-atom/OP_RETURN_VOID.S
index 8bc786d..4d8c92b 100644
--- a/vm/mterp/x86-atom/OP_RETURN_VOID.S
+++ b/vm/mterp/x86-atom/OP_RETURN_VOID.S
@@ -18,4 +18,3 @@
*/
jmp common_returnFromMethod
-
diff --git a/vm/mterp/x86-atom/OP_RSUB_INT_LIT8.S b/vm/mterp/x86-atom/OP_RSUB_INT_LIT8.S
index b3633e6..d6114dd 100644
--- a/vm/mterp/x86-atom/OP_RSUB_INT_LIT8.S
+++ b/vm/mterp/x86-atom/OP_RSUB_INT_LIT8.S
@@ -34,4 +34,3 @@
sub %ecx, %edx # %edx<- +CC sub vBB
SET_VREG %edx, rINST # vAA<- %edx; result
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_SGET_BOOLEAN.S b/vm/mterp/x86-atom/OP_SGET_BOOLEAN.S
index f262b41..8e383b4 100644
--- a/vm/mterp/x86-atom/OP_SGET_BOOLEAN.S
+++ b/vm/mterp/x86-atom/OP_SGET_BOOLEAN.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/OP_SGET.S"
-
diff --git a/vm/mterp/x86-atom/OP_SGET_OBJECT.S b/vm/mterp/x86-atom/OP_SGET_OBJECT.S
index d893676..5145f14 100644
--- a/vm/mterp/x86-atom/OP_SGET_OBJECT.S
+++ b/vm/mterp/x86-atom/OP_SGET_OBJECT.S
@@ -18,5 +18,3 @@
*/
%include "x86-atom/OP_SGET.S"
-
-
diff --git a/vm/mterp/x86-atom/OP_SHL_LONG_2ADDR.S b/vm/mterp/x86-atom/OP_SHL_LONG_2ADDR.S
index 5bc4870..28dfaf2 100644
--- a/vm/mterp/x86-atom/OP_SHL_LONG_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_SHL_LONG_2ADDR.S
@@ -39,4 +39,3 @@
psllq %xmm0, %xmm1 # %xmm1<- shifted vA
movq %xmm1, (rFP, rINST, 4) # vA<- shifted vA
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_SHR_LONG.S b/vm/mterp/x86-atom/OP_SHR_LONG.S
index 7745cdb..be893ef 100644
--- a/vm/mterp/x86-atom/OP_SHR_LONG.S
+++ b/vm/mterp/x86-atom/OP_SHR_LONG.S
@@ -51,4 +51,3 @@
.L${opcode}_final:
movq %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_SHR_LONG_2ADDR.S b/vm/mterp/x86-atom/OP_SHR_LONG_2ADDR.S
index bc98be9..38aefcf 100644
--- a/vm/mterp/x86-atom/OP_SHR_LONG_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_SHR_LONG_2ADDR.S
@@ -52,5 +52,3 @@
.L${opcode}_final:
movq %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 1 # jump to next instruction
-
-
diff --git a/vm/mterp/x86-atom/OP_SUB_INT.S b/vm/mterp/x86-atom/OP_SUB_INT.S
index aab64fc..be530aa 100644
--- a/vm/mterp/x86-atom/OP_SUB_INT.S
+++ b/vm/mterp/x86-atom/OP_SUB_INT.S
@@ -18,4 +18,3 @@
*/
%include "x86-atom/binop.S" {"instr":"subl (rFP, %edx, 4), %ecx"}
-
diff --git a/vm/mterp/x86-atom/OP_THROW.S b/vm/mterp/x86-atom/OP_THROW.S
index 2b87c88..85afa7a 100644
--- a/vm/mterp/x86-atom/OP_THROW.S
+++ b/vm/mterp/x86-atom/OP_THROW.S
@@ -34,4 +34,3 @@
je common_errNullObject # handle null object
movl rINST, offThread_exception(%ecx) # thread->exception<- object
jmp common_exceptionThrown # handle exception
-
diff --git a/vm/mterp/x86-atom/OP_USHR_LONG.S b/vm/mterp/x86-atom/OP_USHR_LONG.S
index 35e8d69..1c404f0 100644
--- a/vm/mterp/x86-atom/OP_USHR_LONG.S
+++ b/vm/mterp/x86-atom/OP_USHR_LONG.S
@@ -37,4 +37,3 @@
psrlq %xmm0, %xmm1 # %xmm1<- shifted vBB
movsd %xmm1, (rFP, rINST, 4) # vAA<- shifted vBB
FINISH 2 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/OP_USHR_LONG_2ADDR.S b/vm/mterp/x86-atom/OP_USHR_LONG_2ADDR.S
index d3a215f..31cb5bc 100644
--- a/vm/mterp/x86-atom/OP_USHR_LONG_2ADDR.S
+++ b/vm/mterp/x86-atom/OP_USHR_LONG_2ADDR.S
@@ -39,4 +39,3 @@
psrlq %xmm0, %xmm1 # %xmm1<- shifted vA
movq %xmm1, (rFP, rINST, 4) # vA<- shifted vA
FINISH 1 # jump to next instruction
-
diff --git a/vm/mterp/x86-atom/TODO.txt b/vm/mterp/x86-atom/TODO.txt
index 0bebef5..c49532e 100644
--- a/vm/mterp/x86-atom/TODO.txt
+++ b/vm/mterp/x86-atom/TODO.txt
@@ -12,4 +12,3 @@
(lo) Implement OP_EXECUTE_INLINE_RANGE
(lo) Implement OP_*_WIDE_VOLATILE
(lo) OP_THROW needs to export the PC
-
diff --git a/vm/mterp/x86-atom/binop.S b/vm/mterp/x86-atom/binop.S
index 7fc6de2..0343190 100644
--- a/vm/mterp/x86-atom/binop.S
+++ b/vm/mterp/x86-atom/binop.S
@@ -40,5 +40,3 @@
$instr # %ecx<- vBB op vCC
SET_VREG %ecx, rINST # vAA<- %ecx; result
OLD_JMP_4 %eax
-
-
diff --git a/vm/mterp/x86-atom/binop2addr.S b/vm/mterp/x86-atom/binop2addr.S
index 2aa55a1..af135a7 100644
--- a/vm/mterp/x86-atom/binop2addr.S
+++ b/vm/mterp/x86-atom/binop2addr.S
@@ -42,5 +42,3 @@
$instr # %ecx<- vA op vB
#FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
OLD_JMP_4 %eax
-
-
diff --git a/vm/mterp/x86-atom/binopD2addr.S b/vm/mterp/x86-atom/binopD2addr.S
index 789f899..a4fcf65 100644
--- a/vm/mterp/x86-atom/binopD2addr.S
+++ b/vm/mterp/x86-atom/binopD2addr.S
@@ -66,4 +66,3 @@
movl $$0, (rFP, rINST, 4) # vAA<- 0
.endif
FGETOP_JMP 1, %edx # jump to next instruction; getop, jmp
-
diff --git a/vm/mterp/x86-atom/binopDLit16.S b/vm/mterp/x86-atom/binopDLit16.S
index 7c1a3b3..86bb937 100644
--- a/vm/mterp/x86-atom/binopDLit16.S
+++ b/vm/mterp/x86-atom/binopDLit16.S
@@ -69,4 +69,3 @@
.endif
movzbl 1(rPC), rINST
jmp *dvmAsmInstructionJmpTable(, %edx, 4)
-
diff --git a/vm/mterp/x86-atom/unopWide.S b/vm/mterp/x86-atom/unopWide.S
index 1e4795c..3790a2c 100644
--- a/vm/mterp/x86-atom/unopWide.S
+++ b/vm/mterp/x86-atom/unopWide.S
@@ -41,5 +41,3 @@
$instr # do operation part 2
movq $result, (rFP, %ecx, 4) # vA<- result
FGETOP_JMP 1, %eax # jump to next instruction; getop, jmp
-
-
diff --git a/vm/mterp/x86-atom/unused.S b/vm/mterp/x86-atom/unused.S
index 8898f1e..8267709 100644
--- a/vm/mterp/x86-atom/unused.S
+++ b/vm/mterp/x86-atom/unused.S
@@ -28,4 +28,3 @@
*/
call common_abort
-
diff --git a/vm/mterp/x86/OP_AGET.S b/vm/mterp/x86/OP_AGET.S
index d83786b..fe87037 100644
--- a/vm/mterp/x86/OP_AGET.S
+++ b/vm/mterp/x86/OP_AGET.S
@@ -21,4 +21,3 @@
SET_VREG(%eax,%ecx)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_AGET_WIDE.S b/vm/mterp/x86/OP_AGET_WIDE.S
index 2470bc5..c050156 100644
--- a/vm/mterp/x86/OP_AGET_WIDE.S
+++ b/vm/mterp/x86/OP_AGET_WIDE.S
@@ -25,4 +25,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_APUT.S b/vm/mterp/x86/OP_APUT.S
index b99c1b2..b9a660f 100644
--- a/vm/mterp/x86/OP_APUT.S
+++ b/vm/mterp/x86/OP_APUT.S
@@ -21,4 +21,3 @@
$store $reg,(%eax)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_APUT_OBJECT.S b/vm/mterp/x86/OP_APUT_OBJECT.S
index 640894e..2069950 100644
--- a/vm/mterp/x86/OP_APUT_OBJECT.S
+++ b/vm/mterp/x86/OP_APUT_OBJECT.S
@@ -44,4 +44,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_APUT_WIDE.S b/vm/mterp/x86/OP_APUT_WIDE.S
index 1f67057..658ca7c 100644
--- a/vm/mterp/x86/OP_APUT_WIDE.S
+++ b/vm/mterp/x86/OP_APUT_WIDE.S
@@ -25,4 +25,3 @@
movl %ecx,(%eax)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_4.S b/vm/mterp/x86/OP_CONST_4.S
index 284a30b..499f7c3 100644
--- a/vm/mterp/x86/OP_CONST_4.S
+++ b/vm/mterp/x86/OP_CONST_4.S
@@ -8,4 +8,3 @@
sarl $$4,%eax
SET_VREG(%eax,%ecx)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_CLASS.S b/vm/mterp/x86/OP_CONST_CLASS.S
index 4d76a7c..fa37917 100644
--- a/vm/mterp/x86/OP_CONST_CLASS.S
+++ b/vm/mterp/x86/OP_CONST_CLASS.S
@@ -39,4 +39,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_STRING.S b/vm/mterp/x86/OP_CONST_STRING.S
index 68e71e6..96e5dcd 100644
--- a/vm/mterp/x86/OP_CONST_STRING.S
+++ b/vm/mterp/x86/OP_CONST_STRING.S
@@ -38,4 +38,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_STRING_JUMBO.S b/vm/mterp/x86/OP_CONST_STRING_JUMBO.S
index 2ccfdb4..45316f9 100644
--- a/vm/mterp/x86/OP_CONST_STRING_JUMBO.S
+++ b/vm/mterp/x86/OP_CONST_STRING_JUMBO.S
@@ -38,4 +38,3 @@
FETCH_INST_WORD(3)
ADVANCE_PC(3)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_WIDE.S b/vm/mterp/x86/OP_CONST_WIDE.S
index 55145de..aa582b8 100644
--- a/vm/mterp/x86/OP_CONST_WIDE.S
+++ b/vm/mterp/x86/OP_CONST_WIDE.S
@@ -9,4 +9,3 @@
movl %eax,(%ecx)
ADVANCE_PC(5)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_CONST_WIDE_HIGH16.S b/vm/mterp/x86/OP_CONST_WIDE_HIGH16.S
index 00d1e97..1d726f4 100644
--- a/vm/mterp/x86/OP_CONST_WIDE_HIGH16.S
+++ b/vm/mterp/x86/OP_CONST_WIDE_HIGH16.S
@@ -9,4 +9,3 @@
xorl %eax,%eax
SET_VREG_WORD(%eax,%ecx,0) # v[AA+0]<- eax
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_DIV_LONG.S b/vm/mterp/x86/OP_DIV_LONG.S
index 6d408ab..f324be3 100644
--- a/vm/mterp/x86/OP_DIV_LONG.S
+++ b/vm/mterp/x86/OP_DIV_LONG.S
@@ -50,6 +50,3 @@
xorl %eax,%eax
movl $special,%edx
jmp .L${opcode}_finish
-
-
-
diff --git a/vm/mterp/x86/OP_DIV_LONG_2ADDR.S b/vm/mterp/x86/OP_DIV_LONG_2ADDR.S
index 01de27c..128ede0 100644
--- a/vm/mterp/x86/OP_DIV_LONG_2ADDR.S
+++ b/vm/mterp/x86/OP_DIV_LONG_2ADDR.S
@@ -52,4 +52,3 @@
xorl %eax,%eax
movl $special,%edx
jmp .L${opcode}_finish
-
diff --git a/vm/mterp/x86/OP_EXECUTE_INLINE.S b/vm/mterp/x86/OP_EXECUTE_INLINE.S
index 9567b74..1eca6e2 100644
--- a/vm/mterp/x86/OP_EXECUTE_INLINE.S
+++ b/vm/mterp/x86/OP_EXECUTE_INLINE.S
@@ -64,4 +64,3 @@
sall $$4,%eax # index *= sizeof(table entry)
jmp *gDvmInlineOpsTable(%eax)
# will return to caller of .L${opcode}_continue
-
diff --git a/vm/mterp/x86/OP_FILLED_NEW_ARRAY.S b/vm/mterp/x86/OP_FILLED_NEW_ARRAY.S
index aa247a8..a98f6b9 100644
--- a/vm/mterp/x86/OP_FILLED_NEW_ARRAY.S
+++ b/vm/mterp/x86/OP_FILLED_NEW_ARRAY.S
@@ -127,4 +127,3 @@
call dvmThrowException
UNSPILL(rPC)
jmp common_exceptionThrown
-
diff --git a/vm/mterp/x86/OP_IGET.S b/vm/mterp/x86/OP_IGET.S
index 38a67cd..cd8033f 100644
--- a/vm/mterp/x86/OP_IGET.S
+++ b/vm/mterp/x86/OP_IGET.S
@@ -62,4 +62,3 @@
SET_VREG(%ecx,%eax)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_IGET_WIDE.S b/vm/mterp/x86/OP_IGET_WIDE.S
index 4a91d1b..77a5994 100644
--- a/vm/mterp/x86/OP_IGET_WIDE.S
+++ b/vm/mterp/x86/OP_IGET_WIDE.S
@@ -62,4 +62,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_INSTANCE_OF.S b/vm/mterp/x86/OP_INSTANCE_OF.S
index 1f52b56..71b92d3 100644
--- a/vm/mterp/x86/OP_INSTANCE_OF.S
+++ b/vm/mterp/x86/OP_INSTANCE_OF.S
@@ -100,4 +100,3 @@
GET_VREG(%eax,%eax) # eax<- vB (obj)
movl offObject_clazz(%eax),%eax # eax<- obj->clazz
jmp .L${opcode}_resolved
-
diff --git a/vm/mterp/x86/OP_INVOKE_INTERFACE.S b/vm/mterp/x86/OP_INVOKE_INTERFACE.S
index 1631177..ff48ab8 100644
--- a/vm/mterp/x86/OP_INVOKE_INTERFACE.S
+++ b/vm/mterp/x86/OP_INVOKE_INTERFACE.S
@@ -36,4 +36,3 @@
testl %eax,%eax
je common_exceptionThrown
jmp common_invokeMethod${routine}
-
diff --git a/vm/mterp/x86/OP_INVOKE_STATIC.S b/vm/mterp/x86/OP_INVOKE_STATIC.S
index 40dac06..a8a8d77 100644
--- a/vm/mterp/x86/OP_INVOKE_STATIC.S
+++ b/vm/mterp/x86/OP_INVOKE_STATIC.S
@@ -34,4 +34,3 @@
testl %eax,%eax # got null?
jne common_invokeMethod${routine}
jmp common_exceptionThrown
-
diff --git a/vm/mterp/x86/OP_INVOKE_SUPER_QUICK.S b/vm/mterp/x86/OP_INVOKE_SUPER_QUICK.S
index 7545eb0..96c662a 100644
--- a/vm/mterp/x86/OP_INVOKE_SUPER_QUICK.S
+++ b/vm/mterp/x86/OP_INVOKE_SUPER_QUICK.S
@@ -24,4 +24,3 @@
EXPORT_PC()
movl (%ecx,%eax,4),%eax # eax<- super->vtable[BBBB]
jmp common_invokeMethod${routine}
-
diff --git a/vm/mterp/x86/OP_INVOKE_VIRTUAL.S b/vm/mterp/x86/OP_INVOKE_VIRTUAL.S
index 20d9120..85fcf83 100644
--- a/vm/mterp/x86/OP_INVOKE_VIRTUAL.S
+++ b/vm/mterp/x86/OP_INVOKE_VIRTUAL.S
@@ -53,4 +53,3 @@
movl offClassObject_vtable(%ecx),%ecx # ecx<- thisPtr->clazz->vtable
movl (%ecx,%eax,4),%eax # eax<- vtable[methodIndex]
jmp common_invokeMethod${routine}
-
diff --git a/vm/mterp/x86/OP_INVOKE_VIRTUAL_QUICK.S b/vm/mterp/x86/OP_INVOKE_VIRTUAL_QUICK.S
index f36ed2d..1ba93eb 100644
--- a/vm/mterp/x86/OP_INVOKE_VIRTUAL_QUICK.S
+++ b/vm/mterp/x86/OP_INVOKE_VIRTUAL_QUICK.S
@@ -21,5 +21,3 @@
EXPORT_PC() # might throw later - get ready
movl (%eax,%ecx,4),%eax # eax<- vtable[BBBB]
jmp common_invokeMethod${routine}
-
-
diff --git a/vm/mterp/x86/OP_MOVE_FROM16.S b/vm/mterp/x86/OP_MOVE_FROM16.S
index e14817d..35d3147 100644
--- a/vm/mterp/x86/OP_MOVE_FROM16.S
+++ b/vm/mterp/x86/OP_MOVE_FROM16.S
@@ -8,4 +8,3 @@
ADVANCE_PC(2)
SET_VREG (%ecx,%eax) # fp[AA]<- ecx]
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_MUL_INT_LIT8.S b/vm/mterp/x86/OP_MUL_INT_LIT8.S
index 8a046c3..2cf11b3 100644
--- a/vm/mterp/x86/OP_MUL_INT_LIT8.S
+++ b/vm/mterp/x86/OP_MUL_INT_LIT8.S
@@ -11,4 +11,3 @@
FETCH_INST_WORD(2)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_MUL_LONG.S b/vm/mterp/x86/OP_MUL_LONG.S
index 3bee2c6..fd151e0 100644
--- a/vm/mterp/x86/OP_MUL_LONG.S
+++ b/vm/mterp/x86/OP_MUL_LONG.S
@@ -41,4 +41,3 @@
movl %eax,(rFP,%ecx,4) # v[B]<- %eax
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_MUL_LONG_2ADDR.S b/vm/mterp/x86/OP_MUL_LONG_2ADDR.S
index 83a042a..5651dfe 100644
--- a/vm/mterp/x86/OP_MUL_LONG_2ADDR.S
+++ b/vm/mterp/x86/OP_MUL_LONG_2ADDR.S
@@ -39,4 +39,3 @@
UNSPILL(rIBASE)
ADVANCE_PC(1)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_NEW_ARRAY.S b/vm/mterp/x86/OP_NEW_ARRAY.S
index cb07aed..74d72ed 100644
--- a/vm/mterp/x86/OP_NEW_ARRAY.S
+++ b/vm/mterp/x86/OP_NEW_ARRAY.S
@@ -70,4 +70,3 @@
SET_VREG(%eax,%ecx)
ADVANCE_PC(2)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/OP_NEW_INSTANCE.S b/vm/mterp/x86/OP_NEW_INSTANCE.S
index d56d55c..e11e518 100644
--- a/vm/mterp/x86/OP_NEW_INSTANCE.S
+++ b/vm/mterp/x86/OP_NEW_INSTANCE.S
@@ -91,6 +91,3 @@
call dvmThrowExceptionWithClassMessage
UNSPILL(rPC)
jmp common_exceptionThrown
-
-
-
diff --git a/vm/mterp/x86/OP_OR_INT_LIT16.S b/vm/mterp/x86/OP_OR_INT_LIT16.S
index ec4f9c1..fa70e99 100644
--- a/vm/mterp/x86/OP_OR_INT_LIT16.S
+++ b/vm/mterp/x86/OP_OR_INT_LIT16.S
@@ -1,3 +1,2 @@
%verify "executed"
%include "x86/binopLit16.S" {"instr":"orl %ecx,%eax"}
-
diff --git a/vm/mterp/x86/OP_OR_INT_LIT8.S b/vm/mterp/x86/OP_OR_INT_LIT8.S
index d4cc0b4..5761806 100644
--- a/vm/mterp/x86/OP_OR_INT_LIT8.S
+++ b/vm/mterp/x86/OP_OR_INT_LIT8.S
@@ -1,3 +1,2 @@
%verify "executed"
%include "x86/binopLit8.S" {"instr":"orl %ecx,%eax"}
-
diff --git a/vm/mterp/x86/OP_RETURN_VOID.S b/vm/mterp/x86/OP_RETURN_VOID.S
index 48aaba9..4d4291f 100644
--- a/vm/mterp/x86/OP_RETURN_VOID.S
+++ b/vm/mterp/x86/OP_RETURN_VOID.S
@@ -1,3 +1,2 @@
%verify "executed"
jmp common_returnFromMethod
-
diff --git a/vm/mterp/x86/OP_SGET.S b/vm/mterp/x86/OP_SGET.S
index 7c17579..f05eae7 100644
--- a/vm/mterp/x86/OP_SGET.S
+++ b/vm/mterp/x86/OP_SGET.S
@@ -41,4 +41,3 @@
testl %eax,%eax
jne .L${opcode}_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
diff --git a/vm/mterp/x86/OP_SGET_WIDE.S b/vm/mterp/x86/OP_SGET_WIDE.S
index 17c71fb..5c038a7 100644
--- a/vm/mterp/x86/OP_SGET_WIDE.S
+++ b/vm/mterp/x86/OP_SGET_WIDE.S
@@ -42,4 +42,3 @@
testl %eax,%eax
jne .L${opcode}_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
diff --git a/vm/mterp/x86/OP_SPUT.S b/vm/mterp/x86/OP_SPUT.S
index d880422..952ca87 100644
--- a/vm/mterp/x86/OP_SPUT.S
+++ b/vm/mterp/x86/OP_SPUT.S
@@ -41,4 +41,3 @@
testl %eax,%eax
jne .L${opcode}_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
diff --git a/vm/mterp/x86/OP_SPUT_WIDE.S b/vm/mterp/x86/OP_SPUT_WIDE.S
index 584ce9d..5a48c2e 100644
--- a/vm/mterp/x86/OP_SPUT_WIDE.S
+++ b/vm/mterp/x86/OP_SPUT_WIDE.S
@@ -43,4 +43,3 @@
testl %eax,%eax
jne .L${opcode}_finish # success, continue
jmp common_exceptionThrown # no, handle exception
-
diff --git a/vm/mterp/x86/OP_THROW_VERIFICATION_ERROR.S b/vm/mterp/x86/OP_THROW_VERIFICATION_ERROR.S
index c3b5063..e492e2d 100644
--- a/vm/mterp/x86/OP_THROW_VERIFICATION_ERROR.S
+++ b/vm/mterp/x86/OP_THROW_VERIFICATION_ERROR.S
@@ -17,4 +17,3 @@
call dvmThrowVerificationError # call(method, kind, ref)
UNSPILL(rPC)
jmp common_exceptionThrown # handle exception
-
diff --git a/vm/mterp/x86/binflop.S b/vm/mterp/x86/binflop.S
index 6f251ee..233799c 100644
--- a/vm/mterp/x86/binflop.S
+++ b/vm/mterp/x86/binflop.S
@@ -13,4 +13,3 @@
ADVANCE_PC(2)
$store (rFP,%ecx,4) # %st to vAA
GOTO_NEXT
-
diff --git a/vm/mterp/x86/binop.S b/vm/mterp/x86/binop.S
index 1370c8f..00d9118 100644
--- a/vm/mterp/x86/binop.S
+++ b/vm/mterp/x86/binop.S
@@ -18,4 +18,3 @@
ADVANCE_PC(2)
SET_VREG($result,%ecx)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/footer.S b/vm/mterp/x86/footer.S
index b322ff7..09eeb6e 100644
--- a/vm/mterp/x86/footer.S
+++ b/vm/mterp/x86/footer.S
@@ -541,4 +541,3 @@
.asciz "Ljava/lang/InternalError;"
.LstrFilledNewArrayNotImpl:
.asciz "filled-new-array only implemented for 'int'"
-
diff --git a/vm/mterp/x86/header.S b/vm/mterp/x86/header.S
index ff90d77..bb043ba 100644
--- a/vm/mterp/x86/header.S
+++ b/vm/mterp/x86/header.S
@@ -206,4 +206,3 @@
* to expand the macros into assembler assignment statements.
*/
#include "../common/asm-constants.h"
-
diff --git a/vm/mterp/x86/shop2addr.S b/vm/mterp/x86/shop2addr.S
index 63efeee..9e8bd56 100644
--- a/vm/mterp/x86/shop2addr.S
+++ b/vm/mterp/x86/shop2addr.S
@@ -14,4 +14,3 @@
FETCH_INST_WORD(1)
ADVANCE_PC(1)
GOTO_NEXT
-
diff --git a/vm/mterp/x86/zcmp.S b/vm/mterp/x86/zcmp.S
index 3acd093..221822d 100644
--- a/vm/mterp/x86/zcmp.S
+++ b/vm/mterp/x86/zcmp.S
@@ -20,4 +20,3 @@
FETCH_INST_INDEXED(%eax)
ADVANCE_PC_INDEXED(%eax)
GOTO_NEXT
-
diff --git a/vm/native/InternalNative.c b/vm/native/InternalNative.c
index e2df6b2..700c8af 100644
--- a/vm/native/InternalNative.c
+++ b/vm/native/InternalNative.c
@@ -346,4 +346,3 @@
}
return false;
}
-
diff --git a/vm/native/README.txt b/vm/native/README.txt
index 78630eb..bc8912f 100644
--- a/vm/native/README.txt
+++ b/vm/native/README.txt
@@ -21,4 +21,3 @@
JNI performance be deemed insufficient. The Bridge version is used as
an optimization for a few high-volume Object calls, and should generally
not be used as we may drop support for it at some point.
-
diff --git a/vm/native/dalvik_system_DexFile.c b/vm/native/dalvik_system_DexFile.c
index fc95d30..3567a14 100644
--- a/vm/native/dalvik_system_DexFile.c
+++ b/vm/native/dalvik_system_DexFile.c
@@ -447,4 +447,3 @@
Dalvik_dalvik_system_DexFile_isDexOptNeeded },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/dalvik_system_VMStack.c b/vm/native/dalvik_system_VMStack.c
index d62fea9..4a1ce53 100644
--- a/vm/native/dalvik_system_VMStack.c
+++ b/vm/native/dalvik_system_VMStack.c
@@ -235,4 +235,3 @@
Dalvik_dalvik_system_VMStack_getThreadStackTrace },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_Class.c b/vm/native/java_lang_Class.c
index 91381ab..223ed62 100644
--- a/vm/native/java_lang_Class.c
+++ b/vm/native/java_lang_Class.c
@@ -810,4 +810,3 @@
Dalvik_java_lang_Class_setAccessibleNoCheck },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_Object.c b/vm/native/java_lang_Object.c
index 44f581e..f2adf52 100644
--- a/vm/native/java_lang_Object.c
+++ b/vm/native/java_lang_Object.c
@@ -109,4 +109,3 @@
Dalvik_java_lang_Object_getClass },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_String.c b/vm/native/java_lang_String.c
index 48a8f83..b3cb7ec 100644
--- a/vm/native/java_lang_String.c
+++ b/vm/native/java_lang_String.c
@@ -40,4 +40,3 @@
Dalvik_java_lang_String_intern },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_System.c b/vm/native/java_lang_System.c
index dd76764..42bc940 100644
--- a/vm/native/java_lang_System.c
+++ b/vm/native/java_lang_System.c
@@ -297,4 +297,3 @@
Dalvik_java_lang_System_mapLibraryName },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_SystemProperties.c b/vm/native/java_lang_SystemProperties.c
index d3501f4..bbcf25e 100644
--- a/vm/native/java_lang_SystemProperties.c
+++ b/vm/native/java_lang_SystemProperties.c
@@ -62,4 +62,3 @@
Dalvik_java_lang_SystemProperties_postInit },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_Throwable.c b/vm/native/java_lang_Throwable.c
index cb94f0f..f96ee6d 100644
--- a/vm/native/java_lang_Throwable.c
+++ b/vm/native/java_lang_Throwable.c
@@ -63,4 +63,3 @@
Dalvik_java_lang_Throwable_nativeGetStackTrace },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_VMClassLoader.c b/vm/native/java_lang_VMClassLoader.c
index adec8d1..e8dbc6e 100644
--- a/vm/native/java_lang_VMClassLoader.c
+++ b/vm/native/java_lang_VMClassLoader.c
@@ -199,4 +199,3 @@
Dalvik_java_lang_VMClassLoader_loadClass },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_VMThread.c b/vm/native/java_lang_VMThread.c
index e9d6cad..3b7331b 100644
--- a/vm/native/java_lang_VMThread.c
+++ b/vm/native/java_lang_VMThread.c
@@ -260,4 +260,3 @@
Dalvik_java_lang_VMThread_yield },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_AccessibleObject.c b/vm/native/java_lang_reflect_AccessibleObject.c
index 3843f26..46a1357 100644
--- a/vm/native/java_lang_reflect_AccessibleObject.c
+++ b/vm/native/java_lang_reflect_AccessibleObject.c
@@ -42,4 +42,3 @@
Dalvik_java_lang_reflect_AccessibleObject_getClassSignatureAnnotation },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_Array.c b/vm/native/java_lang_reflect_Array.c
index ddd608e..e7713f6 100644
--- a/vm/native/java_lang_reflect_Array.c
+++ b/vm/native/java_lang_reflect_Array.c
@@ -144,4 +144,3 @@
Dalvik_java_lang_reflect_Array_createMultiArray },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_Constructor.c b/vm/native/java_lang_reflect_Constructor.c
index 6878f7b..76f69a9 100644
--- a/vm/native/java_lang_reflect_Constructor.c
+++ b/vm/native/java_lang_reflect_Constructor.c
@@ -162,4 +162,3 @@
Dalvik_java_lang_reflect_Constructor_getSignatureAnnotation },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_Field.c b/vm/native/java_lang_reflect_Field.c
index 72f4c65..65879f4 100644
--- a/vm/native/java_lang_reflect_Field.c
+++ b/vm/native/java_lang_reflect_Field.c
@@ -445,4 +445,3 @@
Dalvik_java_lang_reflect_Field_getSignatureAnnotation },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_Method.c b/vm/native/java_lang_reflect_Method.c
index 760a090..f73c8d0 100644
--- a/vm/native/java_lang_reflect_Method.c
+++ b/vm/native/java_lang_reflect_Method.c
@@ -217,4 +217,3 @@
Dalvik_java_lang_reflect_Method_getSignatureAnnotation },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_lang_reflect_Proxy.c b/vm/native/java_lang_reflect_Proxy.c
index e71e11d..da1232c 100644
--- a/vm/native/java_lang_reflect_Proxy.c
+++ b/vm/native/java_lang_reflect_Proxy.c
@@ -45,4 +45,3 @@
Dalvik_java_lang_reflect_Proxy_generateProxy },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_security_AccessController.c b/vm/native/java_security_AccessController.c
index e0699f5..1c35b0e 100644
--- a/vm/native/java_security_AccessController.c
+++ b/vm/native/java_security_AccessController.c
@@ -137,4 +137,3 @@
Dalvik_java_security_AccessController_getStackDomains },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/java_util_concurrent_atomic_AtomicLong.c b/vm/native/java_util_concurrent_atomic_AtomicLong.c
index c46631f..eb1d0de 100644
--- a/vm/native/java_util_concurrent_atomic_AtomicLong.c
+++ b/vm/native/java_util_concurrent_atomic_AtomicLong.c
@@ -36,4 +36,3 @@
Dalvik_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/org_apache_harmony_dalvik_NativeTestTarget.c b/vm/native/org_apache_harmony_dalvik_NativeTestTarget.c
index 131acd3..ccc9467 100644
--- a/vm/native/org_apache_harmony_dalvik_NativeTestTarget.c
+++ b/vm/native/org_apache_harmony_dalvik_NativeTestTarget.c
@@ -40,4 +40,3 @@
Dalvik_org_apache_harmony_dalvik_NativeTestTarget_emptyInternalMethod },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/org_apache_harmony_dalvik_ddmc_DdmServer.c b/vm/native/org_apache_harmony_dalvik_ddmc_DdmServer.c
index 9c940d4..570d469 100644
--- a/vm/native/org_apache_harmony_dalvik_ddmc_DdmServer.c
+++ b/vm/native/org_apache_harmony_dalvik_ddmc_DdmServer.c
@@ -46,4 +46,3 @@
Dalvik_org_apache_harmony_dalvik_ddmc_DdmServer_nativeSendChunk },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.c b/vm/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.c
index 5868a8b..caa280b 100644
--- a/vm/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.c
+++ b/vm/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.c
@@ -167,4 +167,3 @@
Dalvik_org_apache_harmony_dalvik_ddmc_DdmVmInternal_getRecentAllocations },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/native/sun_misc_Unsafe.c b/vm/native/sun_misc_Unsafe.c
index 82a162b..b1f3e83 100644
--- a/vm/native/sun_misc_Unsafe.c
+++ b/vm/native/sun_misc_Unsafe.c
@@ -347,4 +347,3 @@
Dalvik_sun_misc_Unsafe_putObject },
{ NULL, NULL, NULL },
};
-
diff --git a/vm/oo/AccessCheck.c b/vm/oo/AccessCheck.c
index e3a6946..95b7f3e 100644
--- a/vm/oo/AccessCheck.c
+++ b/vm/oo/AccessCheck.c
@@ -148,4 +148,3 @@
// field->clazz->descriptor, field->accessFlags);
return checkAccess(accessFrom, field->clazz, field->accessFlags);
}
-
diff --git a/vm/oo/TypeCheck.c b/vm/oo/TypeCheck.c
index 1762045..fdd38ea 100644
--- a/vm/oo/TypeCheck.c
+++ b/vm/oo/TypeCheck.c
@@ -246,4 +246,3 @@
INSTANCEOF_CACHE_SIZE, instance, clazz);
#undef ATOMIC_CACHE_CALC
}
-
diff --git a/vm/reflect/Annotation.c b/vm/reflect/Annotation.c
index cfaa0ab..ca708a7 100644
--- a/vm/reflect/Annotation.c
+++ b/vm/reflect/Annotation.c
@@ -2182,4 +2182,3 @@
iterator->elementsLeft--;
return true;
}
-
diff --git a/vm/test/AtomicSpeed.c b/vm/test/AtomicSpeed.c
index 859c65d..0f723fc 100644
--- a/vm/test/AtomicSpeed.c
+++ b/vm/test/AtomicSpeed.c
@@ -112,4 +112,3 @@
return true;
}
-
